sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop_liyi

Browse Source 
# Conflicts:
#	lib/network/api_provider_base.dart
This commit is contained in:
liyi 2025-01-03 11:37:59 +08:00
commit 3bd96e58b9
63 changed files with 295 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/app/build.gradle
View File

@ -240,7 +240,11 @@ android {
productFlavors.dev.signingConfig signingConfigs.debug
productFlavors.pre.signingConfig signingConfigs.debug
productFlavors.sky.signingConfig signingConfigs.sky
productFlavors.sky_dev.signingConfig signingConfigs.sky
productFlavors.sky_pre.signingConfig signingConfigs.sky
productFlavors.xhj.signingConfig signingConfigs.xhj
productFlavors.xhj_dev.signingConfig signingConfigs.xhj
productFlavors.xhj_pre.signingConfig signingConfigs.xhj
}
release {
// 高德地图导致release编译模式下应用闪退，根据：[高德地图在Debug模式下运行正常但是打Release包时则闪退解决办法](https://blog.csdn.net/weixin_39370093/article/details/109631210)
@ -252,7 +256,11 @@ android {
productFlavors.dev.signingConfig signingConfigs.debug
productFlavors.pre.signingConfig signingConfigs.debug
productFlavors.sky.signingConfig signingConfigs.sky
productFlavors.sky_dev.signingConfig signingConfigs.sky
productFlavors.sky_pre.signingConfig signingConfigs.sky
productFlavors.xhj.signingConfig signingConfigs.xhj
productFlavors.xhj_dev.signingConfig signingConfigs.xhj
productFlavors.xhj_pre.signingConfig signingConfigs.xhj
}
}

6
ios/Runner/en.lproj/InfoPlist.strings
View File

@ -1,12 +1,12 @@
/*
InfoPlist_xhj.strings
InfoPlist_sky.strings
Runner
Created by Mac on 2024/12/25.
*/
CFBundleName="StarLock";
CFBundleDisplayName="StarLock";
CFBundleName="TTLock Pro";
CFBundleDisplayName="TTLock Pro";
NSBluetoothAlwaysUsageDescription="The app uses bluetooth to find, connect and transfer data between different devices";
NSBluetoothPeripheralUsageDescription="The app uses bluetooth to find, connect and transfer data between different devices";
NSCameraUsageDescription="The application requests the camera to take photos for avatar upload and face authentication";

6
ios/Runner/zh-Hans.lproj/InfoPlist.strings
View File

@ -1,12 +1,12 @@
/*
InfoPlist_xhj.strings
InfoPlist_sky.strings
Runner
Created by Mac on 2024/12/25.
*/
CFBundleName="星锁";
CFBundleDisplayName="星锁";
CFBundleName="锁通通";
CFBundleDisplayName="锁通通";
NSBluetoothAlwaysUsageDescription="该应用程序使用蓝牙在不同设备之间查找、连接和传输数据";
NSBluetoothPeripheralUsageDescription="该应用程序使用蓝牙在不同设备之间查找、连接和传输数据";
NSCameraUsageDescription="应用请求相机，以便于拍摄照片，用于头像上传及人脸认证";

5
lan/lan_ar.json
View File

@ -582,7 +582,6 @@
"商城": "مول",
"我的": "لي",
"微信公众号推送": "حساب عام Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "لفتح wechat لتلقي رسائل التنبيه ، تحتاج إلى الانتباه إلى قفل Skye الذكي wechat الحساب العام أولاً ، يرجى حفظ رمز الاستجابة السريعة واستخدام wechat لمسح الإعدادات",
"蓝牙": "بلوتوث",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "الوصول إلى أذونات البلوتوث مطلوب لاستخدام معلومات الموقع لوظيفة مفتاح الإضافة",
"请输入Email": "أدخل بريدك الإلكتروني",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "اتبع النظام"
"跟随系统": "اتبع النظام",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "بعد إعادة الضبط ، سيتم حذف بصمات القفل. هل أنت متأكد أنك تريد إعادة ضبطه ؟",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "بعد إعادة الضبط ، سيتم حذف جهاز التحكم عن بعد للقفل. هل تريد إعادة ضبطه ؟"
}

5
lan/lan_bg.json
View File

@ -583,7 +583,6 @@
"商城": "Мол",
"我的": "Мой",
"微信公众号推送": "Публичен акаунт wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "За да отворите wechat, за да получавате алармени съобщения, първо трябва да обърнете внимание на публичната сметка на skye smart lock wechat, моля, запишете qr кода и използвайте wechat, за да сканирате настройките",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "За използване на информацията за местоположението на функцията за добавяне на ключ е необходим достъп до bluetooth разрешения",
"请输入Email": "Въведете вашия имейл",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Следете система"
"跟随系统": "Следете система",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "След нулиране, пръстовите отпечатъци на заключването ще бъдат изтрити. Сигурен ли сте, че искате да го нулирате?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "След нулиране, дистанционното управление на ключалката ще бъде изтрито. Искате ли да го нулирате?"
}

5
lan/lan_bn.json
View File

@ -582,7 +582,6 @@
"商城": "XmallName",
"我的": "My",
"微信公众号推送": "ইয়াক",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "টোপেনডেট হোয়াট্ট",
"蓝牙": "নিকট্রিয়াথ",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "ক্ষেত্রে ট্যাক্সট lu▁ইমেরিসিসোসিয়েশনস ...বিরোধী ...বিরোধী",
"请输入Email": "দ্বিগুণ",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "এক্ফক্লোসিস্টেম"
"跟随系统": "এক্ফক্লোসিস্টেম",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "ব্যান্ডোটারট্রাসেট, thelock'sferprinতা?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "ব্যান্ডোটারপ্রাসেট, নিয়ন্ত্রণের নিয়ন্ত্রণ। ডোডো ডাইভান্টটুরে?"
}

5
lan/lan_cs.json
View File

@ -582,7 +582,6 @@
"商城": "Mall",
"我的": "My",
"微信公众号推送": "Veřejný účet wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Chcete-li otevřít wechat a přijímat poplašné zprávy, musíte nejprve věnovat pozornost veřejnému účtu skye smart lock wechat, uložte qr kód a použijte wechat k skenování nastavení",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Pro použití informací o umístění funkce přidat klíč je zapotřebí přístup k oprávněním bluetooth.",
"请输入Email": "Zadejte e-mail",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Sledovat systém"
"跟随系统": "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?"
}

5
lan/lan_da.json
View File

@ -582,7 +582,6 @@
"商城": "Indkøbscent",
"我的": "Je",
"微信公众号推送": "Vichat offentlige konto",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "For at åbne Wechat for at modtage alarmbeskeder, skal du være opmærksom på Skye Smart Lock vichat offentlige konto først, gem venligst QR-koden og brug wechat til at scanne indstillinger",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Adgang til Bluetooth-tilladelser er påkrævet for at bruge placeringsinformationen for tilføje nøglefunktionens placering",
"请输入Email": "Indtast din e- mail",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Følg systemet"
"跟随系统": "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?"
}

5
lan/lan_de.json
View File

@ -582,7 +582,6 @@
"商城": "Einkaufs zentrum",
"我的": "Meine",
"微信公众号推送": "Wechat öffentliches Konto",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Um Wechat zu öffnen, um Alarm meldungen zu erhalten, müssen Sie zuerst auf das öffentliche Konto von Skye Smart Lock wechat achten. Speichern Sie den QR-Code und verwenden Sie wechat, um die Einstellungen zu scannen",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Zugriff auf Bluetooth-Berechtigungen ist erforderlich, um die Standort informationen der Add-Key-Funktion zu verwenden",
"请输入Email": "Geben Sie Ihre E-Mail-Adresse ein",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "System folgen"
"跟随系统": "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?"
}

5
lan/lan_el.json
View File

@ -582,7 +582,6 @@
"商城": "Εμπορικό",
"我的": "Μου",
"微信公众号推送": "Συνομιλία δημόσιου λογαριασμού",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Για να ανοίξετε τη συζήτηση για να λάβετε μηνύματα συναγερμού, θα πρέπει να δώσετε προσοχή στο Skye Smart Lock δημόσιο λογαριασμό για τη συζήτηση. παρακαλώ αποθηκεύστε τον κωδικό QR και χρησιμοποιήστε τη συνομιλία για σάρωση των ρυθμίσεων",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Απαιτείται πρόσβαση στις άδειες Bluetooth για τη χρήση των πληροφοριών τοποθεσίας της λειτουργίας βασικής προσθήκης",
"请输入Email": "Εισάγετε το email σας",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Ακολουθήστε το σύστημα"
"跟随系统": "Ακολουθήστε το σύστημα",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Μετά την επαναφορά, τα αποτυπώματα της κλειδαριάς θα διαγραφούν. Είστε σίγουροι ότι θέλετε να το επαναφέρετε;",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Μετά την επαναφορά, το τηλεχειριστήριο της κλειδαριάς θα διαγραφεί. Θέλεις να το επαναφέρεις;"
}

8
lan/lan_en.json
View File

@ -584,7 +584,6 @@
"商城": "mall",
"我的": "my",
"微信公众号推送": "Wechat public account",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "To open wechat to receive alarm messages, you need to pay attention to Skye Smart Lock wechat public account first, please save the QR code and use wechat to scan the Settings",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Access to Bluetooth permissions is required to use the location information of the add key function",
"请输入Email": "Enter your Email",
@ -1090,7 +1089,6 @@
"修改名字": "Edit name",
"时": "hour",
"分": "minute",
"Amazon Alexa": "Amazon Alexa",
"您可以使用Alexa进行开锁、闭锁和查看锁状态": "You can use Alexa to unlock, lock and check the lock status",
"支持的国家": "Supported countries",
@ -1103,12 +1101,10 @@
"支持的语言": "Supported languages",
"英语": "English",
"Google Home操作流程的值": "1. Use the Smart lock APP to add locks and gateways \n\n2. Enable the remote unlocking function of the lock in the APP (this function is turned off by default). Without this option, the lock does not support Google Home \n\n3. Install the Google Home APP and click the \"+\" button in the top left corner \n\n4. On the Settings page, select \"Work with Google\" \n\n5. Search for \"ScienerSmart\" and use the smart lock APP account and password to authorize",
"密码需至少包含数字/字母/字符中的2种组合": "The password must contain at least 2 of the following: numbers, letters, and special characters",
"已开锁": "Unlocked",
"已闭锁": "Locked",
"两次密码不一致哦": "The passwords are inconsistent",
"中功率": "Medium power",
"常规使用": "Regular use",
"扫描设备": "Scan device",
@ -1123,5 +1119,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Follow system"
"跟随系统": "Follow system",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "After reset, the lock's fingerprints will be deleted. Are you sure you want to reset it?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "After reset, the remote control of the lock will be deleted. Do you want to reset it?"
}

5
lan/lan_es.json
View File

@ -582,7 +582,6 @@
"商城": "Centro comercial",
"我的": "Mi",
"微信公众号推送": "Cuenta pública de Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Para abrir wechat para recibir mensajes de alarma, debe prestar atención a Skye Smart Lock wechat cuenta pública primero, guarde el código QR y use wechat para escanear la configuración",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Se requiere el acceso a los permisos de Bluetooth para usar la información de ubicación de la función de tecla agregar",
"请输入Email": "Ingrese su correo electrónico",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Seguir sistema"
"跟随系统": "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?"
}

5
lan/lan_et.json
View File

@ -582,7 +582,6 @@
"商城": "Kaubamaja",
"我的": "Minu",
"微信公众号推送": "Jutt avalik konto",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Et avada häiresõnumite vastuvõtmiseks, peate esmalt tähelepanu Skye Smart Locki avalikule kontole, palun salvesta QR koodi ja kasuta seadistuste skaneerimiseks",
"蓝牙": "BluetoothName",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Juurdepääs Bluetooth-i õigustele on vaja, et kasutada asukoha lisamise funktsiooni asukoha teavet",
"请输入Email": "Sisesta oma e- postil",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Süsteemi jälgimine"
"跟随系统": "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?"
}

5
lan/lan_fi.json
View File

@ -582,7 +582,6 @@
"商城": "Ostoskeskus",
"我的": "Minun",
"微信公众号推送": "Keskustele julkinen tili",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Voidakseen avata keskustelua hälytysviestien vastaanottamiseksi sinun on kiinnitettävä huomiota Skye Smart Lockin julkiseen keskusteluun. Tallenna QR-koodi ja käytä keskustelua asetusten kartoittamiseen",
"蓝牙": "BluetoothName",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Pääsy Bluetooth-oikeuksiin vaaditaan käyttämään sijaintitietoja lisätä avaintoiminnon lisäämiseksi",
"请输入Email": "Anna sähköposti",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Seuraa järjestelmää"
"跟随系统": "Seuraa järjestelmää",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Lukon sormenjäljet poistetaan. Haluatko varmasti nollataa sen?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Nollauksen jälkeen lukon kaukosäädin poistetaan. Haluatko palauttaa sen?"
}

5
lan/lan_fr.json
View File

@ -582,7 +582,6 @@
"商城": "Centre commercial",
"我的": "Mon",
"微信公众号推送": "Compte public Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Pour ouvrir wechat pour recevoir des messages d'alarme, vous devez faire attention à Skye Smart Lock compte public wechat d'abord, s'il vous plaît enregistrer le code QR et utiliser wechat pour scanner les paramètres",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "L'accès aux autorisations Bluetooth est nécessaire pour utiliser les informations de localisation de la fonction de touche d'ajout",
"请输入Email": "Entrez votre email",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Suivre le système"
"跟随系统": "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?"
}

5
lan/lan_he.json
View File

@ -582,7 +582,6 @@
"商城": "קניון",
"我的": "שלי",
"微信公众号推送": "חשבון הציבור",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "כדי לפתוח wechat כדי לקבל הודעות אזעקה, עליך לשים לב כדי skye חכם מנעול wechat code, אנא שמור את קוד qr ולהשתמש wechat כדי לסרוק את ההגדרות",
"蓝牙": "בלוץ",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "גישה הרשאות Bluetooth נדרש להשתמש במידע המיקום של פונקציית מפתח הוספת",
"请输入Email": "הזן את כתובת הדוא \"ל שלך",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "מערכת מעקב"
"跟随系统": "מערכת מעקב",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "לאחר איפוס, טביעות האצבעות של המנעול יימחקו. אתה בטוח שברצונך לאפס את זה?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "לאחר איפוס, השליטה מרחוק של המנעול יימחק. אתה רוצה לאפס את זה?"
}

5
lan/lan_hk.json
View File

@ -583,7 +583,6 @@
"商城": "购物中心",
"我的": "我的",
"微信公众号推送": "微信公众账号",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "打开微信接收报警信息，需先关注天凯智能锁微信公众账号，保存二维码后使用微信扫描设置",
"蓝牙": "蓝牙",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "使用add key功能的位置信息需要有蓝牙权限",
"请输入Email": "输入你的电子邮箱",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "跟踪系统"
"跟随系统": "跟踪系统",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "重置后，锁上的指纹会被删除。你确定要重置吗？",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置后，锁的远程控制将被删除。你想重置它吗？"
}

5
lan/lan_hr.json
View File

@ -582,7 +582,6 @@
"商城": "Centar.",
"我的": "Moj moj",
"微信公众号推送": "Razgovaraj o javnom računu",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Da biste otvorili razgovor i primali alarmne poruke, morate obratiti pažnju na Skye Smart Lock čavrlja javni račun prvo, Molim spremite QR kod i koristite we chat za skeniranje postavke",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Pristup Bluetooth dozvolama je potreban za korištenje informacija o lokaciji funkcije dodavanja ključeva",
"请输入Email": "Unesite svoj email",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Prati sistem:"
"跟随系统": "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š?"
}

5
lan/lan_hu.json
View File

@ -582,7 +582,6 @@
"商城": "Mall",
"我的": "My",
"微信公众号推送": "Wechat nyilvános számla",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "A wechat megnyitásához a riasztási üzenetek fogadásához először a skye smart lock wechat nyilvános számlára kell figyelni, kérjük, mentse el a qr kódot és használja a wechat-et a beállítások beolvasásához",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "A bluetooth engedélyekhez való hozzáférés szükséges ahhoz, hogy a kulcs hozzáadása függvény helyének adatait használhassuk",
"请输入Email": "Írja be az e-mail",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Follow system"
"跟随系统": "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?"
}

5
lan/lan_id.json
View File

@ -582,7 +582,6 @@
"商城": "Mall",
"我的": "My",
"微信公众号推送": "Akun publik Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Untuk membuka wechat untuk menerima pesan alarm, Anda perlu perhatian Skye kunci pintar akun publik wechat terlebih dahulu, Harap simpan kode QR dan gunakan wechat untuk memindai pengaturan",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Akses ke Izin Bluetooth diperlukan untuk menggunakan informasi lokasi fungsi kunci Tambah",
"请输入Email": "Masukkan Email anda",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Sistem mengikuti"
"跟随系统": "Sistem mengikuti",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Setelah mengulang, sidik jari kunci akan dihapus. Yakin ingin meresetnya?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Setelah reset, remote control kunci akan dihapus. Ingin mengatur ulang?"
}

5
lan/lan_it.json
View File

@ -582,7 +582,6 @@
"商城": "Centro commerciale",
"我的": "Il mio",
"微信公众号推送": "Conto pubblico Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Per aprire wechat per ricevere messaggi di allarme, è necessario prestare attenzione prima all'account pubblico Skye Smart Lock wechat, salva il codice QR e usa wechat per scansionare le impostazioni",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Per utilizzare le informazioni sulla posizione della funzione add key è necessario l'accesso alle autorizzazioni Bluetooth",
"请输入Email": "Inserisci la tua email",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Seguire il sistema"
"跟随系统": "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?"
}

5
lan/lan_ja.json
View File

@ -582,7 +582,6 @@
"商城": "モール",
"我的": "私の",
"微信公众号推送": "Wechatパブリックアカウント",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Wechatを開いてアラームメッセージを受信するには、まずSkye Smart Lock wechat公開アカウントに注意を払う必要があります。QRコードを保存し、wechatを使用して設定をスキャンしてください。",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "追加キー機能の位置情報を使用するには、Bluetooth権限へのアクセスが必要です。",
"请输入Email": "メールを入力",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "システムに従う"
"跟随系统": "システムに従う",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "リセット後、ロックの指紋は削除されます。リセットしてもよろしいですか。",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "リセット後、ロックのリモコンが削除されます。リセットしますか?"
}

8
lan/lan_keys.json
View File

@ -587,7 +587,6 @@
"商城": "mall",
"我的": "my",
"微信公众号推送": "微信公众号推送",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置",
"蓝牙": "蓝牙",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "需要访问蓝牙权限才能使用添加钥匙功能的位置信息",
"请输入Email": "请输入Email",
@ -788,7 +787,6 @@
"导出": "导出",
"批量导出": "批量导出",
"读取记录": "读取记录",
"手机需联网": "手机需联网",
"设备": "设备",
"消息": "消息",
"智能分析": "智能分析",
@ -1091,7 +1089,6 @@
"修改名字": "修改名字",
"时": "时",
"分": "分",
"Amazon Alexa": "Amazon Alexa",
"您可以使用Alexa进行开锁、闭锁和查看锁状态": "您可以使用Alexa进行开锁、闭锁和查看锁状态",
"支持的国家": "支持的国家",
@ -1108,7 +1105,6 @@
"已开锁": "已开锁",
"已闭锁": "已闭锁",
"两次密码不一致哦": "两次密码不一致哦",
"中功率": "中功率",
"常规使用": "常规使用",
"扫描设备": "扫描设备",
@ -1123,5 +1119,7 @@
"日简称": "日简称",
"时简称": "时简称",
"分简称": "分简称",
"跟随系统": "跟随系统"
"跟随系统": "跟随系统",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "重置后，该锁的指纹都将被删除哦，确认要重置吗？",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置后，该锁的遥控都将被删除哦，确认要重置吗？"
}

5
lan/lan_kk.json
View File

@ -582,7 +582,6 @@
"商城": "Ескері",
"我的": "Менін",
"微信公众号推送": "Жалпы тіркелгі тіркеу",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Ескерту хабарламасын алу үшін, алдымен Skye Smart Lock wechat ашық тіркелгі тіркелгісін ашу керек. QR кодын сақтау және баптауларды сканың үшін wechat қолданыңын",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Кілттерді қосу функцияның орналасуы қолдану үшін Bluetooth рұқсаттарын қатынау керек еті",
"请输入Email": "Эл. поштаңызды келтіріңіз",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Жүйені қолдану"
"跟随系统": "Жүйені қолдану",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Қайта ысырып тастау Шынымен ысырып тастауды қалайсыз ба?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Қайта ысырып ысырып тасымалдауын өшіріледі. Оны ысырып тастауды қалайсыз ба?"
}

5
lan/lan_ko.json
View File

@ -582,7 +582,6 @@
"商城": "몰",
"我的": "내",
"微信公众号推送": "위챗 공개 계정",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "경보 메시지를 받기 위해 wechat을 열려면 먼저 Skye Smart Lock wechat 공개 계정에주의를 기울여야합니다. QR 코드를 저장하고 wechat을 사용하여 설정을 스캔하십시오.",
"蓝牙": "블루투스",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "추가 키 기능의 위치 정보를 사용하려면 Bluetooth 권한에 대한 액세스가 필요합니다.",
"请输入Email": "이메일 입력",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "시스템을 따르십시오"
"跟随系统": "시스템을 따르십시오",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "재설정 후 잠금 장치의 지문이 삭제됩니다. 당신은 그것을 재설정 하시겠습니까?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "재설정 후 잠금 장치의 리모컨이 삭제됩니다. 당신은 그것을 재설정 하시겠습니까?"
}

5
lan/lan_lt.json
View File

@ -582,7 +582,6 @@
"商城": "Mall",
"我的": "Mano",
"微信公众号推送": "Wechat viešoji sąskaita",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Norėdami atidaryti „ wechat “, kad gautumėte signalizacijos pranešimus, pirmiausia reikia atkreipti dėmesį į „ skye smart lock wechat“ viešąją sąskaitą, įrašykite qr kodą ir naudokite „ wechat “, kad nuskaitytumėte nustatymus.",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Prieiga prie „ bluetooth “leidimų reikalinga norint naudoti rakto pridėties funkcijos vietos informaciją",
"请输入Email": "Įveskite savo el. laišką",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Sekti sistema"
"跟随系统": "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?"
}

5
lan/lan_ms.json
View File

@ -582,7 +582,6 @@
"商城": "Pusat membeli-belah",
"我的": "Saya",
"微信公众号推送": "Akaun awam Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Untuk membuka wechat untuk menerima mesej penggera, anda perlu memberi perhatian kepada Skye Smart Lock wechat akaun awam terlebih dahulu, sila simpan kod QR dan gunakan wechat untuk mengimbas tetapan",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Akses kepada kebenaran Bluetooth diperlukan untuk menggunakan maklumat lokasi fungsi tambah utama",
"请输入Email": "Masukkan e-mel anda",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Ikut system"
"跟随系统": "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?"
}

5
lan/lan_nl.json
View File

@ -582,7 +582,6 @@
"商城": "Winkelcentrum",
"我的": "Mijn",
"微信公众号推送": "Wechat openbaar account",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Om wechat te openen om alarmberichten te ontvangen, moet u eerst aandacht besteden aan Skye Smart Lock wechat openbare account, sla de QR-code op en gebruik wechat om de instellingen te scannen",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Toegang tot Bluetooth-machtigingen is vereist om de locatie-informatie van de add-sleutelfunctie te gebruiken",
"请输入Email": "Voer uw e-mail in",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Systeem volgen"
"跟随系统": "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?"
}

5
lan/lan_pl.json
View File

@ -582,7 +582,6 @@
"商城": "Centrum handlowe",
"我的": "Mój",
"微信公众号推送": "Konto publiczne Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Aby otworzyć wechat, aby otrzymywać komunikaty alarmowe, należy najpierw zwrócić uwagę na konto publiczne Wechat Skye Smart Lock, zapisz kod QR i użyj wechat, aby zeskanować Ustawienia",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Dostęp do uprawnień Bluetooth jest wymagany do korzystania z informacji o lokalizacji funkcji dodawania klucza",
"请输入Email": "Wpisz swój e-mail",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Śledź system"
"跟随系统": "Ś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ć?"
}

5
lan/lan_pt.json
View File

@ -582,7 +582,6 @@
"商城": "Shopping",
"我的": "Meu",
"微信公众号推送": "Conta pública Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Para abrir o wechat para receber mensagens de alarme, você precisa prestar atenção à conta pública do Skye Smart Lock wechat primeiro, salve o código QR e use o wechat para digitalizar as configurações",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Acesso a permissões Bluetooth é necessário para usar as informações de localização da função adicionar chave",
"请输入Email": "Digite seu Email",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Siga o sistema"
"跟随系统": "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?"
}

5
lan/lan_ro.json
View File

@ -582,7 +582,6 @@
"商城": "Mall",
"我的": "Ma",
"微信公众号推送": "Căutați contul public.",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Pentru a deschide chat pentru a primi mesaje de alarmă, trebuie să acordați atenție la Skye Smart Lock We chat cont public în primul rând, salvați codul QR și folosiți chat pentru a scana Setările",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Accesul la permisiunile Bluetooth este necesar pentru a utiliza informațiile de locație ale funcției de adăugare cheie",
"请输入Email": "Introduceți email",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Urmează sistemul:"
"跟随系统": "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?"
}

5
lan/lan_ru.json
View File

@ -582,7 +582,6 @@
"商城": "Торговый центр",
"我的": "Мой",
"微信公众号推送": "Публичный аккаунт Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Чтобы открыть WeChat для получения тревожных сообщений, вам необходимо сначала обратить внимание на общедоступную учетную запись WeChat Skye Smart Lock, сохраните QR-код и используйте WeChat для сканирования настроек.",
"蓝牙": "Блютуз",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Доступ к разрешениям Bluetooth требуется для использования информации о местоположении функции добавления ключа",
"请输入Email": "Введите свой адрес электронной почты",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Следуйте системе"
"跟随系统": "Следуйте системе",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "После сброса отпечатки пальцев замка будут удалены. Вы уверены, что хотите его перезагрузить?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "После сброса пульт дистанционного управления замком будет удален. А вы хотите его сбросить?"
}

5
lan/lan_sk.json
View File

@ -582,7 +582,6 @@
"商城": "Mall",
"我的": "My",
"微信公众号推送": "Wechat verejný účet",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Ak chcete otvoriť wechat pre prijímanie poplašných správ, musíte venovať pozornosť skye smart lock wechat verejný účet najprv, prosím, uložiť qr kód a použiť wechat pre skenovanie nastavenia",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Prístup k oprávneniam bluetooth je potrebný na použitie informácií o polohe funkcie pridať kľúča",
"请输入Email": "Zadajte svoj e-mail",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Sledovať systém"
"跟随系统": "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ť?"
}

7
lan/lan_sr_cyrl.json
View File

@ -181,7 +181,7 @@
"隐藏无效开锁权限": "Сакриј неважећи приступ",
"APP开锁时需手机连网的锁": "Браве које захтевају телефон на мрежи",
"增值服务": "Услуге",
"关于": "O nama",
"关于": "O programu",
"退出": "Одјавити се",
"删除账号": "Избриши налог",
"个人信息": "Информације о налогу",
@ -583,7 +583,6 @@
"商城": "Центру",
"我的": "Мој",
"微信公众号推送": "Вецхат јавни налог",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Да бисте отворили вецхат за примање алармних порука, морате обратити пажњу на Скај Смарт Лоцк вецхат јавни рачун прво, молимо вас да сачувате КР код и користите вецхат да скенирате подешавања",
"蓝牙": "Блуетоотх",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Приступ Блуетоотх дозволама је потребан да бисте користили информације о локацији функције додавања кључа",
"请输入Email": "Унесите своју е-пошту",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Пратите систем"
"跟随系统": "Пратите систем",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Након ресетовања, отисци прстију браве ће бити избрисани. Да ли сте сигурни да желите да га ресетујете?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Након ресетовања, даљински управљач браве ће бити избрисан. Да ли желите да га ресетујете?"
}

5
lan/lan_sv.json
View File

@ -582,7 +582,6 @@
"商城": "Mall",
"我的": "Ja",
"微信公众号推送": "Vichatta offentligt konto",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "För att öppna wechatt för att ta emot larmmeddelanden, måste du vara uppmärksam på Skye Smart Lock vichatt offentliga konto först, spara QR-koden och använd wechat för att skanna inställningar",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Tillgång till Bluetooth-rättigheter krävs för att använda platsinformationen för lägg till nyckelfunktionen lägg till.",
"请输入Email": "Skriv in din e- post@ info: whatsthis",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Följ system"
"跟随系统": "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?"
}

5
lan/lan_th.json
View File

@ -582,7 +582,6 @@
"商城": "ห้างสรรพสินค้าเล็กๆ",
"我的": "ของฉัน",
"微信公众号推送": "บัญชีสาธารณะ WeChat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "ในการเปิด WeChat เพื่อรับข้อความเตือนคุณต้องใส่ใจกับบัญชีสาธารณะของ Skye Smart Lock WeChat ก่อนโปรดบันทึกรหัส QR และใช้ WeChat เพื่อสแกนการตั้งค่า",
"蓝牙": "บลูทูธ",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "การเข้าถึงการอนุญาตบลูทูธจะต้องใช้ข้อมูลตำแหน่งของฟังก์ชั่นเพิ่มคีย์",
"请输入Email": "การป้อนอีเมลของคุณ",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "ระบบติดตามผล"
"跟随系统": "ระบบติดตามผล",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "หลังจากรีเซ็ตแล้วลายนิ้วมือของล็อคจะถูกลบออกคุณแน่ใจว่าอยากจะรีเซ็ต?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "หลังจากรีเซ็ตแล้วรีโมทคอนโทรลของล็อคจะถูกลบออกคุณต้องการรีเซ็ตไหม"
}

5
lan/lan_tr.json
View File

@ -582,7 +582,6 @@
"商城": "Alışveriş merkezi",
"我的": "Benim",
"微信公众号推送": "Wechat kamu hesabı",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Alarm mesajları almak için wechat açmak için, ilk önce skye akıllı kilit wechat kamu hesabına dikkat etmeniz gerekir, lütfen qr kodunu kaydedin ve ayarları taramak için wechat'i kullanın",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Ekle tuş fonksiyonunun konum bilgilerini kullanmak için bluetooth izinlerine erişim gereklidir",
"请输入Email": "Email girin",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Sistemi takip et"
"跟随系统": "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?"
}

5
lan/lan_tw.json
View File

@ -582,7 +582,6 @@
"商城": "商場",
"我的": "我的",
"微信公众号推送": "微信公眾賬號",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "打開微信接收報警信息,需要先關注斯凱智能鎖微信公眾賬號,請保存二維碼,使用微信掃描設置",
"蓝牙": "藍牙",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "需要訪問藍牙權限才能使用添加鍵功能的位置信息",
"请输入Email": "輸入您的電子郵件",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "跟蹤系統"
"跟随系统": "跟蹤系統",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "重置後,鎖的指紋將被刪除。 是否確實要重置它?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置後,鎖的遙控器將被刪除。 是否要重置它?"
}

5
lan/lan_uk.json
View File

@ -583,7 +583,6 @@
"商城": "торго́вий центр",
"我的": "мій",
"微信公众号推送": "Публічний обліковий запис Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Щоб відкрити wechat для отримання тривожних повідомлень, вам потрібно спочатку звернути увагу на загальнодоступний обліковий запис wechat Skye Smart Lock, збережіть QR-код і за допомогою wechat відскануйте налаштування",
"蓝牙": "Технологія Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Доступ до дозволів Bluetooth потрібен для використання інформації про місцезнаходження функції додавання ключа",
"请输入Email": "Введіть свою електронну пошту",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Система стеження за"
"跟随系统": "Система стеження за",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "Після скидання відбитки пальців замка будуть видалені. Ви впевнені, що хочете скинути налаштування?",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "Після скидання пульт дистанційного керування замком буде видалено. Хочете його скинути?"
}

5
lan/lan_vi.json
View File

@ -582,7 +582,6 @@
"商城": "Trung tâm mua sắm",
"我的": "Của tôi",
"微信公众号推送": "Tài khoản công cộng Wechat",
"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "Để mở Wechat để nhận tin nhắn báo động, trước tiên bạn cần chú ý đến tài khoản công cộng Skye Smart Lock WeChat, Vui lòng lưu mã QR và sử dụng Wechat để quét cài đặt",
"蓝牙": "Bluetooth",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "Cần truy cập vào quyền của bluetooth để sử dụng thông tin vị trí của chức năng thêm phím",
"请输入Email": "Nhập email của bạn",
@ -1119,5 +1118,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "Hệ thống theo dõi"
"跟随系统": "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?"
}

9
lan/lan_zh.json
View File

@ -316,7 +316,6 @@
"删除账号后，你的所有信息及相关记录都会从平台彻底删除，且不可恢复，是否删除？": "删除账号后，你的所有信息及相关记录都会从平台彻底删除，且不可恢复，是否删除？",
"监控": "监控",
"视频日志": "视频日志",
"网关设备": "网关设备",
"开门器": "开门器",
"面容开锁": "面容开锁",
"开门方向设置": "开门方向设置",
@ -586,7 +585,6 @@
"商城": "商城",
"我的": "我的",
"微信公众号推送": "微信公众号推送",
"开启微信接收报警消息需要先关注锁通通锁微信公众号，请保存二维码并使用微信扫一扫设置": "开启微信接收报警消息需要先关注锁通通锁微信公众号，请保存二维码并使用微信扫一扫设置",
"蓝牙": "蓝牙",
"需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "需要访问蓝牙权限才能使用添加钥匙功能的位置信息",
"请输入Email": "请输入Email",
@ -787,7 +785,6 @@
"导出": "导出",
"批量导出": "批量导出",
"读取记录": "读取记录",
"手机需联网": "手机需联网",
"设备": "设备",
"消息": "消息",
"智能分析": "智能分析",
@ -1092,7 +1089,6 @@
"修改名字": "修改名字",
"时": "时",
"分": "分",
"Amazon Alexa": "Amazon Alexa",
"您可以使用Alexa进行开锁、闭锁和查看锁状态": "您可以使用Alexa进行开锁、闭锁和查看锁状态",
"支持的国家": "支持的国家",
@ -1109,7 +1105,6 @@
"已开锁": "已开锁",
"已闭锁": "已闭锁",
"两次密码不一致哦": "两次密码不一致哦",
"中功率": "中功率",
"常规使用": "常规使用",
"扫描设备": "扫描设备",
@ -1124,5 +1119,7 @@
"日简称": "D",
"时简称": "H",
"分简称": "M",
"跟随系统": "跟随系统"
"跟随系统": "跟随系统",
"重置后，该锁的指纹都将被删除哦，确认要重置吗？": "重置后，该锁的指纹都将被删除哦，确认要重置吗？",
"重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置后，该锁的遥控都将被删除哦，确认要重置吗？"
}

4
lib/main/lockDetail/lockDetail/lockDetail_logic.dart
View File

@ -606,8 +606,8 @@ class LockDetailLogic extends BaseGetXController {
// 远程开锁
Future<void> remoteOpenLock() async {
final LoginEntity entity = await ApiRepository.to
.remoteOpenLock(lockId: state.keyInfos.value.lockId.toString());
final LoginEntity entity = await ApiRepository.to.remoteOpenLock(
lockId: state.keyInfos.value.lockId.toString(), timeOut: 60);
if (entity.errorCode!.codeIsSuccessful) {
showToast('已开锁'.tr);
}

3
lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_page.dart
View File

@ -73,7 +73,8 @@ class _FaceUnlockPageState extends State<FaceUnlockPage> {
});
// _openBottomItemSheet(state.antiMisoperationStrList.value, 1);
}),
Expanded(child: SizedBox(height: 30.h)),
// Expanded(child: SizedBox(height: 30.h)),
SizedBox(height: 60.h),
_buildTipsView(),
SizedBox(
height: 60.h,

2
lib/main_local.dart
View File

@ -4,7 +4,7 @@ import 'flavors.dart';
import 'main.dart' as runner;
Future<void> main() async {
F.appFlavor = Flavor.sky;
F.appFlavor = Flavor.sky_pre;
// AppLog.log('local调用了main函数');
await runner.main();
}

57
lib/mine/addLock/selectLockType/selectLockType_page.dart
View File

@ -18,7 +18,8 @@ class SelectLockTypePage extends StatefulWidget {
State<SelectLockTypePage> createState() => _SelectLockTypePageState();
}
class _SelectLockTypePageState extends State<SelectLockTypePage> with BaseWidget {
class _SelectLockTypePageState extends State<SelectLockTypePage>
with BaseWidget {
final SelectLockTypeLogic logic = Get.put(SelectLockTypeLogic());
final SelectLockTypeState state = Get.find<SelectLockTypeLogic>().state;
@ -79,36 +80,34 @@ class _SelectLockTypePageState extends State<SelectLockTypePage> with BaseWidget
return <Widget>[
lockTypeItem('images/lockType/lockType_doorLock.png', '门锁'.tr, () {
CommonDataManage().seletLockType = 1;
Navigator.pushNamed(context, Routers.addLockPage,
Get.toNamed(Routers.addLockPage,
arguments: <String, int>{'getLockType': 1});
}),
if (!F.isLite)
lockTypeItem('images/lockType/lockType_NFCLock.png',
'NFC无源锁'.tr, () {
// if (!F.isLite)
lockTypeItem('images/lockType/lockType_NFCLock.png', 'NFC无源锁'.tr, () {
CommonDataManage().seletLockType = 2;
// Navigator.pushNamed(context, Routers.addLockPage);
logic.getNearByLimits();
}),
if (!F.isLite)
lockTypeItem('images/lockType/lockType_padlock.png',
'挂锁'.tr, () {
CommonDataManage().seletLockType = 3;
// if (!F.isLite)
lockTypeItem('images/lockType/lockType_padlock.png', '挂锁'.tr, () {
CommonDataManage().seletLockType = 3;
// Navigator.pushNamed(context, Routers.addLockPage);
logic.getNearByLimits();
}),
lockTypeItem('images/lockType/lockType_safeLock.png',
'保险箱锁'.tr, () {
CommonDataManage().seletLockType = 4;
lockTypeItem('images/lockType/lockType_safeLock.png', '保险箱锁'.tr, () {
CommonDataManage().seletLockType = 4;
Navigator.pushNamed(context, Routers.addLockPage,
arguments: <String, int>{'getLockType': 4});
}),
lockTypeItem('images/lockType/lockType_parkingLock.png',
'车位锁'.tr, () {
CommonDataManage().seletLockType = 5;
lockTypeItem('images/lockType/lockType_parkingLock.png', '车位锁'.tr, () {
CommonDataManage().seletLockType = 5;
Navigator.pushNamed(context, Routers.addLockPage,
arguments: <String, int>{'getLockType': 5});
}),
lockTypeItem('images/lockType/lockType_entranceGuardLock.png',
'智能门禁'.tr, () {
CommonDataManage().seletLockType = 6;
lockTypeItem('images/lockType/lockType_entranceGuardLock.png', '智能门禁'.tr,
() {
CommonDataManage().seletLockType = 6;
Navigator.pushNamed(context, Routers.addLockPage,
arguments: <String, int>{'getLockType': 6});
}),
@ -117,17 +116,17 @@ class _SelectLockTypePageState extends State<SelectLockTypePage> with BaseWidget
// TranslationLoader.lanKeys!.bicycleLock!.tr, () {
// Navigator.pushNamed(context, Routers.addLockPage);
// }),
if (!F.isLite)
lockTypeItem('images/lockType/lockType_gatewayLock.png',
'网关'.tr, () {
CommonDataManage().seletLockType = 7;
Get.toNamed(Routers.selectGatewayTypeNextTipPage);
}),
if (!F.isLite)
lockTypeItem('images/lockType/lockType_camera.png', '网络摄像头'.tr, () {
CommonDataManage().seletLockType = 8;
// Navigator.pushNamed(context, Routers.gatewayListPage);
}),
// if (!F.isLite)
lockTypeItem('images/lockType/lockType_gatewayLock.png', '网关'.tr, () {
CommonDataManage().seletLockType = 7;
Get.toNamed(Routers.selectGatewayTypeNextTipPage);
}),
// if (!F.isLite)
lockTypeItem('images/lockType/lockType_camera.png', '网络摄像头'.tr, () {
CommonDataManage().seletLockType = 8;
// Navigator.pushNamed(context, Routers.gatewayListPage);
logic.getNearByLimits();
}),
];
}

5
lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart
View File

@ -31,7 +31,8 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
networkName: state.wifiNameTF.text,
networkMac: state.gatewayModel.wifiMac,
version: state.gatewayModel.gatewayVersion,
gatewayJson: jsonDecode(state.gatewayJson));
gatewayJson: jsonDecode(state.gatewayJson),
timeout: 60);
if (entity.errorCode!.codeIsSuccessful) {
showToast('配网成功'.tr, something: () {
// eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
@ -42,7 +43,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
Future<void> getGatewayConfiguration() async {
final GetGatewayConfigurationEntity entity =
await ApiRepository.to.getGatewayConfiguration();
await ApiRepository.to.getGatewayConfiguration(timeout: 60);
if (entity.errorCode!.codeIsSuccessful) {
state.getGatewayConfigurationStr = entity.data ?? '';
// AppLog.log('state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}');

1
lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart
View File

@ -3,7 +3,6 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart';
import '../../../../tools/appRouteObserver.dart';
import '../../../../tools/commonItem.dart';

1
lib/mine/gateway/addGateway/gatewayGetWifiList/gatewayGetWifiList_logic.dart
View File

@ -2,7 +2,6 @@ import 'dart:async';
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
import 'package:get/get.dart';
import 'package:star_lock/blue/io_gateway/io_gateway_configuringWifi.dart';
import 'package:star_lock/blue/io_gateway/io_gateway_getWifiList.dart';
import 'package:star_lock/tools/baseGetXController.dart';

5
lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_logic.dart
View File

@ -12,7 +12,8 @@ class GatewayConnectionLockListLogic extends BaseGetXController {
Future<GatewayConnectionLockListEntity>
gatewayConnectionLockListDataRequest() async {
final GatewayConnectionLockListEntity entity = await ApiRepository.to
.gatewayConnectionLockLoadData(gatewayId: state.gatewayId.value);
.gatewayConnectionLockLoadData(
gatewayId: state.gatewayId.value, timeout: 60);
if (entity.errorCode!.codeIsSuccessful) {
state.itemDataList.value = entity.data!.list!;
}
@ -21,7 +22,7 @@ class GatewayConnectionLockListLogic extends BaseGetXController {
Future<void> gatewayScanDevice() async {
final LoginEntity entity = await ApiRepository.to
.gatewayScanDevice(gatewayId: state.gatewayId.value);
.gatewayScanDevice(gatewayId: state.gatewayId.value, timeout: 60);
if (entity.errorCode!.codeIsSuccessful) {
gatewayConnectionLockListDataRequest();
}

2
lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_page.dart
View File

@ -49,7 +49,7 @@ class _GatewayConnectionLockListPageState
Obx(() => Expanded(
child: state.itemDataList.value.isNotEmpty
? ListView.builder(
itemCount: 10,
itemCount: state.itemDataList.value.length,
itemBuilder: (BuildContext c, int index) {
final GatewayConnectionLockItemEntity entity =
state.itemDataList[index];

6
lib/mine/gateway/gatewayDetail/gatewayDetail_logic.dart
View File

@ -12,7 +12,8 @@ class GatewayDetailLogic extends BaseGetXController {
Future<void> deletGateway(int isForce) async {
final LoginEntity entity = await ApiRepository.to.gatewayDelet(
gatewayId: state.getewayItemData.value.gatewayId ?? 0,
isForce: isForce);
isForce: isForce,
timeout: 60);
if (entity.errorCode!.codeIsSuccessful) {
showToast('删除成功'.tr, something: () {
// eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
@ -27,7 +28,8 @@ class GatewayDetailLogic extends BaseGetXController {
Future<void> updateGateway(String gatewayName) async {
final LoginEntity entity = await ApiRepository.to.gatewayUpdate(
gatewayId: state.getewayItemData.value.gatewayId ?? 0,
gatewayName: gatewayName);
gatewayName: gatewayName,
timeout: 60);
if (entity.errorCode!.codeIsSuccessful) {
showToast('修改成功'.tr, something: () {
// eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));

10
lib/mine/gateway/gatewayList/gatewayList_logic.dart
View File

@ -1,4 +1,3 @@
import 'package:star_lock/tools/baseGetXController.dart';
import '../../../login/login/entity/LoginEntity.dart';
@ -18,9 +17,7 @@ class GatewayListLogic extends BaseGetXController {
pageNo = 1;
}
final GetewayDataEntity entity = await ApiRepository.to.getGatewayListData(
pageNo: pageNo.toString(),
pageSize: pageSize,
);
pageNo: pageNo.toString(), pageSize: pageSize, timeout: 60);
if (entity.errorCode!.codeIsSuccessful) {
// 更新数据列表
state.getewayListData.addAll(entity.data!.list!);
@ -51,7 +48,6 @@ class GatewayListLogic extends BaseGetXController {
// @override
// void onInit() {
// super.onInit();
// gatewayDistributionNetwork();
// gatewayDistributionNetwork();
// }
}
}

3
lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart
View File

@ -5,6 +5,7 @@ import 'package:star_lock/mine/mineMultiLanguage/mineMultiLanguage_state.dart';
import 'package:star_lock/translations/current_locale_tool.dart';
import '../../app_settings/app_colors.dart';
import '../../app_settings/app_settings.dart';
import '../../tools/commonItem.dart';
import '../../tools/titleAppBar.dart';
import '../../translations/app_dept.dart';
@ -86,6 +87,8 @@ class _MineMultiLanguagePageState extends State<MineMultiLanguagePage> {
if (state.currentLanguageType.value == lanType) {
state.seletLocale = e;
AppLog.log(
'e:$e lanType:$lanType state.currentLanguageType.value:${state.currentLanguageType.value} Get.locale!.languageCode:${Get.locale!.languageCode} Get.locale!.countryCode:${Get.locale!.countryCode}');
}
l.add(
CommonItem(

15
lib/mine/mineMultiLanguage/mineMultiLanguage_state.dart
View File

@ -4,20 +4,21 @@ import 'package:star_lock/app_settings/app_settings.dart';
import '../../tools/store_service.dart';
import '../../translations/app_dept.dart';
import '../../translations/current_locale_tool.dart';
class MineMultiLanguageState {
// MineMultiLanguageState() {
// resetLan();
// }
MineMultiLanguageState() {}
List<Locale> get languages {
return appDept.deptSupportedLocales;
}
Rx<LanguageType> currentLanguageType =
StoreService.to.getLanguageCode()!.isEmpty
? LanguageType.system.obs
: ExtensionLanguageType.fromLocale(Get.locale!).obs;
Rx<LanguageType> currentLanguageType = StoreService.to
.getLanguageCode()!
.isEmpty
? LanguageType.system.obs
: ExtensionLanguageType.fromLocale(CurrentLocaleTool.getCurrentLocale())
.obs;
late Locale seletLocale;
}

6
lib/mine/mineSet/mineSet/mineSet_logic.dart
View File

@ -186,4 +186,10 @@ class MineSetLogic extends BaseGetXController {
// state.currentLanguage.value = CurrentLocaleTool.getCurrentLocaleString();
// });
// }
@override
Future<void> onReady() async {
super.onReady();
getUserInfoRequest();
}
}

16
lib/mine/mineSet/transferGateway/selectGetewayList_logic.dart
View File

@ -1,20 +1,17 @@
import 'package:star_lock/mine/mineSet/transferGateway/selectGetewayList_entity.dart';
import 'package:star_lock/tools/baseGetXController.dart';
import '../../../network/api_repository.dart';
import 'selectGetewayList_state.dart';
class SelectGetewayListLogic extends BaseGetXController{
class SelectGetewayListLogic extends BaseGetXController {
SelectGetewayListState state = SelectGetewayListState();
// 获取锁列表
Future<void> getGetewayListData() async{
final GetewayDataEntity entity = await ApiRepository.to.getGatewayListData(
pageNo: '1',
pageSize: '20'
);
if(entity.errorCode!.codeIsSuccessful){
Future<void> getGetewayListData() async {
final GetewayDataEntity entity = await ApiRepository.to
.getGatewayListData(pageNo: '1', pageSize: '20', timeout: 60);
if (entity.errorCode!.codeIsSuccessful) {
state.getewayListData.value = entity.data!.list!;
}
}
@ -25,5 +22,4 @@ class SelectGetewayListLogic extends BaseGetXController{
getGetewayListData();
}
}
}

79
lib/network/api_provider.dart
View File

@ -1727,21 +1727,23 @@ class ApiProvider extends BaseProvider {
}));
// 获取网关列表
Future<Response> getGatewayListData(String pageNo, String pageSize) => post(
gatewaykListURL.toUrl,
jsonEncode({'pageNo': pageNo, 'pageSize': pageSize}));
Future<Response> getGatewayListData(
String pageNo, String pageSize, int timeout) =>
post(gatewaykListURL.toUrl,
jsonEncode({'pageNo': pageNo, 'pageSize': pageSize}),
timeout: timeout);
// 添加网关
Future<Response> addGatewayNetwork(
String gatewayName,
String gatewayMac,
String serialNumber,
int gatewayType,
String networkName,
String networkMac,
String version,
Map gatewayJson,
) =>
String gatewayName,
String gatewayMac,
String serialNumber,
int gatewayType,
String networkName,
String networkMac,
String version,
Map gatewayJson,
int timeout) =>
post(
addGatewayURL.toUrl,
jsonEncode({
@ -1753,37 +1755,37 @@ class ApiProvider extends BaseProvider {
'networkMac': networkMac,
'version': version,
'gatewayJson': gatewayJson,
}));
}),
timeout: timeout);
// 删除网关
Future<Response> deletGateway(int gatewayId, int isForce) => post(
deletGatewayURL.toUrl,
jsonEncode({
'gatewayId': gatewayId,
'isForce': isForce,
}));
Future<Response> deletGateway(int gatewayId, int isForce, int timeout) =>
post(
deletGatewayURL.toUrl,
jsonEncode({
'gatewayId': gatewayId,
'isForce': isForce,
}),
timeout: timeout);
// 网关更新
Future<Response> gatewayUpdate(
int gatewayId,
String gatewayName,
) =>
int gatewayId, String gatewayName, int timeout) =>
post(
updateGatewayURL.toUrl,
jsonEncode({
'gatewayId': gatewayId,
'gatewayName': gatewayName,
}));
}),
timeout: timeout);
// 远程开锁
Future<Response> remoteOpenLock(
String lockId,
) =>
post(
remoteOpenLockURL.toUrl,
jsonEncode({
'lockId': lockId,
}));
Future<Response> remoteOpenLock(String lockId, int timeOut) => post(
remoteOpenLockURL.toUrl,
jsonEncode({
'lockId': lockId,
}),
timeout: timeOut);
// 转移网关确认
Future<Response> transferGatewayConfirmInfoData(
@ -1808,14 +1810,17 @@ class ApiProvider extends BaseProvider {
}));
// 获取网关配置
Future<Response> getGatewayConfiguration() =>
post(getGatewayConfigURL.toUrl, jsonEncode({}));
Future<Response> getGatewayConfiguration(int timeout) =>
post(getGatewayConfigURL.toUrl, jsonEncode({}), timeout: timeout);
Future<Response> gatewayConnectionLockListLoadData(int gatewayId) =>
post(gatewayListByLockURL.toUrl, jsonEncode({'gatewayId': gatewayId}));
Future<Response> gatewayConnectionLockListLoadData(
int gatewayId, int timeout) =>
post(gatewayListByLockURL.toUrl, jsonEncode({'gatewayId': gatewayId}),
timeout: timeout);
Future<Response> gatewayScanDevice(int gatewayId) =>
post(gatewayScanDeviceURL.toUrl, jsonEncode({'gatewayId': gatewayId}));
Future<Response> gatewayScanDevice(int gatewayId, int timeout) =>
post(gatewayScanDeviceURL.toUrl, jsonEncode({'gatewayId': gatewayId}),
timeout: timeout);
// 移除坏锁
Future<Response> removeBrokenLockData(List lockIdList) =>

3
lib/network/api_provider_base.dart
View File

@ -37,6 +37,7 @@ class BaseProvider extends GetConnect with Api {
bool? isUserBaseUrl = true, // 文件上传不使用baseUrl
bool? isShowErrMsg = true, // 是否显示没有网络时的提示
bool? isShowNetworkErrorMsg = true, // 是否显示网络其他报错 如403 500等
int? timeout = 15,
}) async {
AppLog.log('post: url:$url body:$body');
if (isUnShowLoading == false) {
@ -47,6 +48,8 @@ class BaseProvider extends GetConnect with Api {
} else {
httpClient.baseUrl = '${F.apiPrefix}/api';
}
httpClient.timeout = timeout!.seconds;
// AppLog.log('timeout:$timeout httpClient.timeout:${httpClient.timeout}');
var res = await super.post(url, body,
contentType: contentType,
headers: headers,

72
lib/network/api_repository.dart
View File

@ -1912,22 +1912,24 @@ class ApiRepository {
// 获取网关列表
Future<GetewayDataEntity> getGatewayListData(
{required String pageNo, required String pageSize}) async {
final res = await apiProvider.getGatewayListData(pageNo, pageSize);
{required String pageNo,
required String pageSize,
required int timeout}) async {
final res = await apiProvider.getGatewayListData(pageNo, pageSize, timeout);
return GetewayDataEntity.fromJson(res.body);
}
// 添加网关
Future<LoginEntity> gatewayDistributionNetwork({
required String gatewayName,
required String gatewayMac,
required String serialNumber,
required int gatewayType,
required String networkName,
required String networkMac,
required String version,
required Map gatewayJson,
}) async {
Future<LoginEntity> gatewayDistributionNetwork(
{required String gatewayName,
required String gatewayMac,
required String serialNumber,
required int gatewayType,
required String networkName,
required String networkMac,
required String version,
required Map gatewayJson,
required int timeout}) async {
final res = await apiProvider.addGatewayNetwork(
gatewayName,
gatewayMac,
@ -1936,25 +1938,27 @@ class ApiRepository {
networkName,
networkMac,
version,
gatewayJson);
gatewayJson,
timeout);
return LoginEntity.fromJson(res.body);
}
// 删除网关
Future<LoginEntity> gatewayDelet({
required int gatewayId,
required int isForce,
}) async {
final res = await apiProvider.deletGateway(gatewayId, isForce);
Future<LoginEntity> gatewayDelet(
{required int gatewayId,
required int isForce,
required int timeout}) async {
final res = await apiProvider.deletGateway(gatewayId, isForce, timeout);
return LoginEntity.fromJson(res.body);
}
// 网关更新
Future<LoginEntity> gatewayUpdate({
required int gatewayId,
required String gatewayName,
}) async {
final res = await apiProvider.gatewayUpdate(gatewayId, gatewayName);
Future<LoginEntity> gatewayUpdate(
{required int gatewayId,
required String gatewayName,
required int timeout}) async {
final res =
await apiProvider.gatewayUpdate(gatewayId, gatewayName, timeout);
return LoginEntity.fromJson(res.body);
}
@ -1970,22 +1974,23 @@ class ApiRepository {
// 网关-附近的锁
Future<GatewayConnectionLockListEntity> gatewayConnectionLockLoadData(
{required int gatewayId}) async {
final res = await apiProvider.gatewayConnectionLockListLoadData(gatewayId);
{required int gatewayId, required int timeout}) async {
final res =
await apiProvider.gatewayConnectionLockListLoadData(gatewayId, timeout);
return GatewayConnectionLockListEntity.fromJson(res.body);
}
// 网关-扫描设备
Future<LoginEntity> gatewayScanDevice({
required int gatewayId,
}) async {
final res = await apiProvider.gatewayScanDevice(gatewayId);
Future<LoginEntity> gatewayScanDevice(
{required int gatewayId, required int timeout}) async {
final res = await apiProvider.gatewayScanDevice(gatewayId, timeout);
return LoginEntity.fromJson(res.body);
}
// 远程开锁
Future<LoginEntity> remoteOpenLock({required String lockId}) async {
final res = await apiProvider.remoteOpenLock(lockId);
Future<LoginEntity> remoteOpenLock(
{required String lockId, required int timeOut}) async {
final res = await apiProvider.remoteOpenLock(lockId, timeOut);
return LoginEntity.fromJson(res.body);
}
@ -2000,8 +2005,9 @@ class ApiRepository {
}
// 获取网关配置
Future<GetGatewayConfigurationEntity> getGatewayConfiguration() async {
final res = await apiProvider.getGatewayConfiguration();
Future<GetGatewayConfigurationEntity> getGatewayConfiguration(
{required int timeout}) async {
final res = await apiProvider.getGatewayConfiguration(timeout);
return GetGatewayConfigurationEntity.fromJson(res.body);
}

4
lib/translations/app_dept.dart
View File

@ -48,7 +48,7 @@ extension ExtensionAppDept on AppDept {
const Locale bgL = Locale('bg', 'BG');
const Locale kkL = Locale('kk', 'KZ');
const Locale bnL = Locale('bn', 'BD');
const Locale hbsL = Locale('hr', 'BA');
const Locale hbsL = Locale('hr', 'HR');
const Locale thL = Locale('th', 'TH');
const Locale idL = Locale('id', 'ID');
const Locale fiL = Locale('fi', 'FI');
@ -581,7 +581,7 @@ extension ExtensionLanguageType on LanguageType {
}
break;
case LanguageType.croatian:
if (locale.languageCode == 'hr' && locale.countryCode == 'BA') {
if (locale.languageCode == 'hr' && locale.countryCode == 'HR') {
return locale;
}
break;

22
lib/translations/current_locale_tool.dart
View File

@ -8,18 +8,15 @@ import 'app_dept.dart';
class CurrentLocaleTool {
/// 获取当前语言的Locale字符串，没有的话获取系统的
static String getCurrentLocaleString() {
final Locale locale = StoreService.to.getLanguageCode()!.isNotEmpty
final String languageCode = StoreService.to.getLanguageCode()!.isNotEmpty
? appDept.deptSupportedLocales
.where((Locale element) =>
element.languageCode.toString() ==
getCurrentLocaleWithLanguageCode(
StoreService.to.getLanguageCode()!)
.languageCode)
element.toString() == StoreService.to.getLanguageCode()!)
.first
: Get.deviceLocale!; // Get.deviceLocale;
final String languageCode = convertLocale(locale).toString();
AppLog.log(
'11111locale.toString(): ${locale.toString()} locale: $locale languageCode:$languageCode 从本地获取code:${StoreService.to.getLanguageCode()}');
.toString()
: convertLocale(Get.deviceLocale!).toString(); // Get.deviceLocale;
// final String languageCode = convertLocale(locale).toString();
// AppLog.log('11111locale.toString(): ${locale.toString()} locale: $locale languageCode:$languageCode 从本地获取code:${StoreService.to.getLanguageCode()}');
return languageCode;
}
@ -28,10 +25,7 @@ class CurrentLocaleTool {
final Locale locale = StoreService.to.getLanguageCode()!.isNotEmpty
? appDept.deptSupportedLocales
.where((Locale element) =>
element.languageCode.toString() ==
getCurrentLocaleWithLanguageCode(
StoreService.to.getLanguageCode()!)
.languageCode)
element.toString() == StoreService.to.getLanguageCode()!)
.first
: Get.deviceLocale!; // Get.deviceLocale;
final Locale getLocale = convertLocale(locale);
@ -129,7 +123,7 @@ class CurrentLocaleTool {
case 'bn':
return const Locale('bn', 'BD');
case 'hr':
return const Locale('hr', 'BA');
return const Locale('hr', 'HR');
case 'th':
return const Locale('th', 'TH');
case 'id':

2
lib/translations/translation_message.dart
View File

@ -35,7 +35,7 @@ class TranslationMessage extends Translations {
'bg_BG': TranslationLoader.bgDic,
'kk_KZ': TranslationLoader.kkDic,
'bn_BD': TranslationLoader.bnDic,
'hr_BA': TranslationLoader.hrDic,
'hr_HR': TranslationLoader.hrDic,
'th_TH': TranslationLoader.thDic,
'id_ID': TranslationLoader.idDic,
'fi_FI': TranslationLoader.fiDic,

2
pubspec.yaml
View File

@ -104,7 +104,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# 1.0.85+2024120301：完善网关功能
# 1.0.85+2024120401：修复网关问题，打包给谢敬调试
version: 1.0.85+2024121301
version: 1.0.85+2024123102
environment:
sdk: '>=2.12.0 <3.0.0'