Compare commits
No commits in common. "279b329a1e71c0c5f3336609ed1bc84a3810d374" and "13bf53e9643229a9eceb68002bebdf2bfb467c91" have entirely different histories.
279b329a1e
...
13bf53e964
@ -1166,6 +1166,5 @@
|
|||||||
"云存会员": "عضوية التخزين السحابي",
|
"云存会员": "عضوية التخزين السحابي",
|
||||||
"服务，图像视频信息随心存！": "معلومات الخدمة والصور والفيديو في قلبك!",
|
"服务，图像视频信息随心存！": "معلومات الخدمة والصور والفيديو في قلبك!",
|
||||||
"图像": "صورة",
|
"图像": "صورة",
|
||||||
"视频": "فيديو",
|
"视频": "فيديو"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "حاليا ، لا تدعم الدولة تسجيل رمز التحقق من الهاتف المحمول ، يرجى استخدام عنوان بريدك الإلكتروني للتسجيل"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Членство в Cloud Storage",
|
"云存会员": "Членство в Cloud Storage",
|
||||||
"服务，图像视频信息随心存！": "Информацията за обслужване, изображения и видео са във вашето сърце!",
|
"服务，图像视频信息随心存！": "Информацията за обслужване, изображения и видео са във вашето сърце!",
|
||||||
"图像": "изображение",
|
"图像": "изображение",
|
||||||
"视频": "Видео",
|
"视频": "Видео"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "В момента страната не поддържа регистрация на код за потвърждение на мобилен телефон, моля, използвайте имейл адреса си, за да се регистрирате"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "ক্লাউড স্টোরেজ সদস্যতা",
|
"云存会员": "ক্লাউড স্টোরেজ সদস্যতা",
|
||||||
"服务，图像视频信息随心存！": "পরিষেবা, চিত্র এবং ভিডিও তথ্য আপনার হৃদয়ে!",
|
"服务，图像视频信息随心存！": "পরিষেবা, চিত্র এবং ভিডিও তথ্য আপনার হৃদয়ে!",
|
||||||
"图像": "প্রতিচ্ছবি",
|
"图像": "প্রতিচ্ছবি",
|
||||||
"视频": "ভিডিও",
|
"视频": "ভিডিও"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "বর্তমানে, দেশটি মোবাইল ফোন যাচাইকরণ কোড নিবন্ধন সমর্থন করে না, নিবন্ধন করতে দয়া করে আপনার ইমেল ঠিকানা ব্যবহার করুন"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Členství v cloudovém úložišti",
|
"云存会员": "Členství v cloudovém úložišti",
|
||||||
"服务，图像视频信息随心存！": "Servis, obrazové a video informace jsou na prvním místě!",
|
"服务，图像视频信息随心存！": "Servis, obrazové a video informace jsou na prvním místě!",
|
||||||
"图像": "obraz",
|
"图像": "obraz",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "V současné době země nepodporuje registraci ověřovacího kódu mobilního telefonu, k registraci použijte prosím svou e-mailovou adresu"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Medlemskab af Cloud Storage",
|
"云存会员": "Medlemskab af Cloud Storage",
|
||||||
"服务，图像视频信息随心存！": "Service-, billed- og videoinformation er i dit hjerte!",
|
"服务，图像视频信息随心存！": "Service-, billed- og videoinformation er i dit hjerte!",
|
||||||
"图像": "billede",
|
"图像": "billede",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "I øjeblikket understøtter landet ikke registrering af mobiltelefonbekræftelseskode, brug venligst din e-mailadresse til at tilmelde dig"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Cloud-Speicher-Mitgliedschaft",
|
"云存会员": "Cloud-Speicher-Mitgliedschaft",
|
||||||
"服务，图像视频信息随心存！": "Service-, Bild- und Videoinformationen liegen Ihnen am Herzen!",
|
"服务，图像视频信息随心存！": "Service-, Bild- und Videoinformationen liegen Ihnen am Herzen!",
|
||||||
"图像": "Bild",
|
"图像": "Bild",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Derzeit unterstützt das Land die Registrierung von Verifizierungscodes für Mobiltelefone nicht, bitte verwenden Sie Ihre E-Mail-Adresse, um sich zu registrieren"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Συνδρομή Cloud Storage",
|
"云存会员": "Συνδρομή Cloud Storage",
|
||||||
"服务，图像视频信息随心存！": "Οι πληροφορίες εξυπηρέτησης, εικόνας και βίντεο είναι στην καρδιά σας!",
|
"服务，图像视频信息随心存！": "Οι πληροφορίες εξυπηρέτησης, εικόνας και βίντεο είναι στην καρδιά σας!",
|
||||||
"图像": "εικόνα",
|
"图像": "εικόνα",
|
||||||
"视频": "Βίντεο",
|
"视频": "Βίντεο"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Προς το παρόν, η χώρα δεν υποστηρίζει την εγγραφή κωδικού επαλήθευσης κινητού τηλεφώνου, χρησιμοποιήστε τη διεύθυνση email σας για να εγγραφείτε"
|
|
||||||
}
|
}
|
||||||
@ -1173,6 +1173,5 @@
|
|||||||
"云存会员": "Cloud Storage Membership",
|
"云存会员": "Cloud Storage Membership",
|
||||||
"服务，图像视频信息随心存！": "Service, image and video information are at your heart!",
|
"服务，图像视频信息随心存！": "Service, image and video information are at your heart!",
|
||||||
"图像": "image",
|
"图像": "image",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Currently, the country does not support mobile phone verification code registration, please use your email address to register"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Membresía de almacenamiento en la nube",
|
"云存会员": "Membresía de almacenamiento en la nube",
|
||||||
"服务，图像视频信息随心存！": "¡La información de servicio, imagen y video está en su corazón!",
|
"服务，图像视频信息随心存！": "¡La información de servicio, imagen y video está en su corazón!",
|
||||||
"图像": "imagen",
|
"图像": "imagen",
|
||||||
"视频": "Vídeo",
|
"视频": "Vídeo"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Actualmente, el país no admite el registro de códigos de verificación de teléfonos móviles, utilice su dirección de correo electrónico para registrarse"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Pilvesalvestuse liikmelisus",
|
"云存会员": "Pilvesalvestuse liikmelisus",
|
||||||
"服务，图像视频信息随心存！": "Teenindus-, pildi- ja videoteave on teie südames!",
|
"服务，图像视频信息随心存！": "Teenindus-, pildi- ja videoteave on teie südames!",
|
||||||
"图像": "Piltide",
|
"图像": "Piltide",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Praegu ei toeta riik mobiiltelefoni kinnituskoodi registreerimist, palun kasutage registreerumiseks oma e-posti aadressi"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Pilvitallennustilan jäsenyys",
|
"云存会员": "Pilvitallennustilan jäsenyys",
|
||||||
"服务，图像视频信息随心存！": "Palvelu-, kuva- ja videotiedot ovat sydämessäsi!",
|
"服务，图像视频信息随心存！": "Palvelu-, kuva- ja videotiedot ovat sydämessäsi!",
|
||||||
"图像": "kuva",
|
"图像": "kuva",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Tällä hetkellä maa ei tue matkapuhelimen vahvistuskoodin rekisteröintiä, käytä rekisteröitymiseen sähköpostiosoitettasi"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Adhésion au stockage dans le cloud",
|
"云存会员": "Adhésion au stockage dans le cloud",
|
||||||
"服务，图像视频信息随心存！": "Le service, l’image et les informations vidéo sont au cœur de vos préoccupations !",
|
"服务，图像视频信息随心存！": "Le service, l’image et les informations vidéo sont au cœur de vos préoccupations !",
|
||||||
"图像": "image",
|
"图像": "image",
|
||||||
"视频": "Vidéo",
|
"视频": "Vidéo"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Actuellement, le pays ne prend pas en charge l’enregistrement du code de vérification du téléphone portable, veuillez utiliser votre adresse e-mail pour vous inscrire"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "חברות באחסון בענן",
|
"云存会员": "חברות באחסון בענן",
|
||||||
"服务，图像视频信息随心存！": "מידע על שירות, תמונה ווידאו נמצאים בלב שלך!",
|
"服务，图像视频信息随心存！": "מידע על שירות, תמונה ווידאו נמצאים בלב שלך!",
|
||||||
"图像": "תמונה",
|
"图像": "תמונה",
|
||||||
"视频": "וידאו",
|
"视频": "וידאו"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "נכון לעכשיו, המדינה אינה תומכת ברישום קוד אימות טלפון נייד, אנא השתמש בכתובת הדוא\"ל שלך כדי להירשם"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "क्लाउड स्टोरेज सदस्यता",
|
"云存会员": "क्लाउड स्टोरेज सदस्यता",
|
||||||
"服务，图像视频信息随心存！": "सेवा, छवि और वीडियो जानकारी आपके दिल में हैं!",
|
"服务，图像视频信息随心存！": "सेवा, छवि और वीडियो जानकारी आपके दिल में हैं!",
|
||||||
"图像": "प्रतिबिंब",
|
"图像": "प्रतिबिंब",
|
||||||
"视频": "वीडियो",
|
"视频": "वीडियो"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "वर्तमान में, देश मोबाइल फोन सत्यापन कोड पंजीकरण का समर्थन नहीं करता है, कृपया पंजीकरण करने के लिए अपने ईमेल पते का उपयोग करें"
|
|
||||||
}
|
}
|
||||||
@ -1168,6 +1168,5 @@
|
|||||||
"云存会员": "雲存會員",
|
"云存会员": "雲存會員",
|
||||||
"服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！",
|
"服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！",
|
||||||
"图像": "圖像",
|
"图像": "圖像",
|
||||||
"视频": "視頻",
|
"视频": "視頻"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "當前國家不支援手機驗證碼註冊，請使用郵箱進行註冊"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Članstvo u pohrani u oblaku",
|
"云存会员": "Članstvo u pohrani u oblaku",
|
||||||
"服务，图像视频信息随心存！": "Informacije o usluzi, slikama i videozapisima su vam u srcu!",
|
"服务，图像视频信息随心存！": "Informacije o usluzi, slikama i videozapisima su vam u srcu!",
|
||||||
"图像": "slika",
|
"图像": "slika",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Trenutno zemlja ne podržava registraciju koda za provjeru mobilnog telefona, za registraciju koristite svoju adresu e-pošte"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Felhőalapú tárolási tagság",
|
"云存会员": "Felhőalapú tárolási tagság",
|
||||||
"服务，图像视频信息随心存！": "A szolgáltatás, a képi és videós információk a szívedben vannak!",
|
"服务，图像视频信息随心存！": "A szolgáltatás, a képi és videós információk a szívedben vannak!",
|
||||||
"图像": "kép",
|
"图像": "kép",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Jelenleg az ország nem támogatja a mobiltelefonos ellenőrző kód regisztrációját, kérjük, használja e-mail címét a regisztrációhoz"
|
|
||||||
}
|
}
|
||||||
@ -1173,6 +1173,5 @@
|
|||||||
"云存会员": "Cloud Storage Membership",
|
"云存会员": "Cloud Storage Membership",
|
||||||
"服务，图像视频信息随心存！": "Ծառայությունը, պատկերը եւ վիդեո տեղեկատվությունը ձեր սրտում են:",
|
"服务，图像视频信息随心存！": "Ծառայությունը, պատկերը եւ վիդեո տեղեկատվությունը ձեր սրտում են:",
|
||||||
"图像": "Պատկերասրահ",
|
"图像": "Պատկերասրահ",
|
||||||
"视频": "Տեսանյութ",
|
"视频": "Տեսանյութ"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Ներկայումս երկիրը չի աջակցում բջջային հեռախոսի ստուգման կոդի գրանցմանը, խնդրում ենք գրանցվելու համար օգտագործել ձեր էլ. փոստի հասցեն"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Keanggotaan Cloud Storage",
|
"云存会员": "Keanggotaan Cloud Storage",
|
||||||
"服务，图像视频信息随心存！": "Informasi layanan, gambar, dan video adalah inti Anda!",
|
"服务，图像视频信息随心存！": "Informasi layanan, gambar, dan video adalah inti Anda!",
|
||||||
"图像": "citra",
|
"图像": "citra",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Saat ini, negara tersebut tidak mendukung pendaftaran kode verifikasi ponsel, silakan gunakan alamat email Anda untuk mendaftar"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Iscrizione al cloud storage",
|
"云存会员": "Iscrizione al cloud storage",
|
||||||
"服务，图像视频信息随心存！": "Le informazioni sul servizio, le immagini e i video sono al tuo centro!",
|
"服务，图像视频信息随心存！": "Le informazioni sul servizio, le immagini e i video sono al tuo centro!",
|
||||||
"图像": "immagine",
|
"图像": "immagine",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Attualmente, il paese non supporta la registrazione del codice di verifica del telefono cellulare, si prega di utilizzare il proprio indirizzo e-mail per registrarsi"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "クラウドストレージメンバーシップ",
|
"云存会员": "クラウドストレージメンバーシップ",
|
||||||
"服务，图像视频信息随心存！": "サービス、画像、ビデオ情報があなたの中心にあります!",
|
"服务，图像视频信息随心存！": "サービス、画像、ビデオ情報があなたの中心にあります!",
|
||||||
"图像": "画像",
|
"图像": "画像",
|
||||||
"视频": "ビデオ",
|
"视频": "ビデオ"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "現在、この国は携帯電話の認証コード登録をサポートしていませんので、メールアドレスを使用して登録してください"
|
|
||||||
}
|
}
|
||||||
@ -1173,6 +1173,5 @@
|
|||||||
"云存会员": "Cloud Storage წევრობა",
|
"云存会员": "Cloud Storage წევრობა",
|
||||||
"服务，图像视频信息随心存！": "მომსახურება, სურათი და ვიდეო ინფორმაცია თქვენს გულშია!",
|
"服务，图像视频信息随心存！": "მომსახურება, სურათი და ვიდეო ინფორმაცია თქვენს გულშია!",
|
||||||
"图像": "სურათი",
|
"图像": "სურათი",
|
||||||
"视频": "ვიდეო",
|
"视频": "ვიდეო"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "ამჟამად, ქვეყანა არ უჭერს მხარს მობილური ტელეფონის დამადასტურებელი კოდის რეგისტრაციას, გთხოვთ გამოიყენოთ თქვენი ელექტრონული ფოსტის მისამართი რეგისტრაციისთვის"
|
|
||||||
}
|
}
|
||||||
@ -1178,6 +1178,5 @@
|
|||||||
"云存会员": "云存会员",
|
"云存会员": "云存会员",
|
||||||
"服务，图像视频信息随心存！": "服务，图像视频信息随心存！",
|
"服务，图像视频信息随心存！": "服务，图像视频信息随心存！",
|
||||||
"图像": "图像",
|
"图像": "图像",
|
||||||
"视频": "视频",
|
"视频": "视频"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "当前国家不支持手机验证码注册，请使用邮箱进行注册"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Бұлтты сақтауға мүшелік",
|
"云存会员": "Бұлтты сақтауға мүшелік",
|
||||||
"服务，图像视频信息随心存！": "Қызмет, бейне және бейне ақпарат сіздің жүрегіңізде жатыр!",
|
"服务，图像视频信息随心存！": "Қызмет, бейне және бейне ақпарат сіздің жүрегіңізде жатыр!",
|
||||||
"图像": "кескіні",
|
"图像": "кескіні",
|
||||||
"视频": "Бейне",
|
"视频": "Бейне"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Қазіргі уақытта елде ұялы телефонды растау кодын тіркеуді қолдамайды, тіркелу үшін электрондық пошта мекенжайыңызды пайдаланыңыз"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "클라우드 스토리지 멤버십",
|
"云存会员": "클라우드 스토리지 멤버십",
|
||||||
"服务，图像视频信息随心存！": "서비스, 이미지 및 비디오 정보가 당신의 중심에 있습니다!",
|
"服务，图像视频信息随心存！": "서비스, 이미지 및 비디오 정보가 당신의 중심에 있습니다!",
|
||||||
"图像": "이미지",
|
"图像": "이미지",
|
||||||
"视频": "비디오",
|
"视频": "비디오"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "현재 해당 국가는 휴대폰 인증코드 등록을 지원하지 않으니 이메일 주소를 사용하여 등록하세요."
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Debesies saugyklos narystė",
|
"云存会员": "Debesies saugyklos narystė",
|
||||||
"服务，图像视频信息随心存！": "Aptarnavimas, vaizdas ir video informacija yra jūsų širdis!",
|
"服务，图像视频信息随心存！": "Aptarnavimas, vaizdas ir video informacija yra jūsų širdis!",
|
||||||
"图像": "vaizdas",
|
"图像": "vaizdas",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Šiuo metu šalis nepalaiko mobiliojo telefono patvirtinimo kodo registracijos, registruodamiesi naudokite savo el. pašto adresą"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Keahlian Storan Awan",
|
"云存会员": "Keahlian Storan Awan",
|
||||||
"服务，图像视频信息随心存！": "Maklumat perkhidmatan, imej dan video adalah di hati anda!",
|
"服务，图像视频信息随心存！": "Maklumat perkhidmatan, imej dan video adalah di hati anda!",
|
||||||
"图像": "Imej",
|
"图像": "Imej",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Pada masa ini, negara ini tidak menyokong pendaftaran kod pengesahan telefon bimbit, sila gunakan alamat e-mel anda untuk mendaftar"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Lidmaatschap voor cloudopslag",
|
"云存会员": "Lidmaatschap voor cloudopslag",
|
||||||
"服务，图像视频信息随心存！": "Service-, beeld- en video-informatie staan bij u centraal!",
|
"服务，图像视频信息随心存！": "Service-, beeld- en video-informatie staan bij u centraal!",
|
||||||
"图像": "beeld",
|
"图像": "beeld",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Momenteel ondersteunt het land de registratie van de verificatiecode voor mobiele telefoons niet, gebruik uw e-mailadres om u te registreren"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Członkostwo w usłudze Cloud Storage",
|
"云存会员": "Członkostwo w usłudze Cloud Storage",
|
||||||
"服务，图像视频信息随心存！": "Informacje o serwisie, obrazie i wideo są w Twoim sercu!",
|
"服务，图像视频信息随心存！": "Informacje o serwisie, obrazie i wideo są w Twoim sercu!",
|
||||||
"图像": "obraz",
|
"图像": "obraz",
|
||||||
"视频": "Wideo",
|
"视频": "Wideo"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Obecnie kraj nie obsługuje rejestracji kodem weryfikacyjnym telefonu komórkowego, użyj swojego adresu e-mail, aby się zarejestrować"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Associação de armazenamento em nuvem",
|
"云存会员": "Associação de armazenamento em nuvem",
|
||||||
"服务，图像视频信息随心存！": "Informações de serviço, imagem e vídeo estão no seu coração!",
|
"服务，图像视频信息随心存！": "Informações de serviço, imagem e vídeo estão no seu coração!",
|
||||||
"图像": "imagem",
|
"图像": "imagem",
|
||||||
"视频": "Vídeo",
|
"视频": "Vídeo"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Atualmente, o país não suporta o registro do código de verificação do telefone celular, use seu endereço de e-mail para se registrar"
|
|
||||||
}
|
}
|
||||||
@ -1172,6 +1172,5 @@
|
|||||||
"云存会员": "Associação de armazenamento em nuvem",
|
"云存会员": "Associação de armazenamento em nuvem",
|
||||||
"服务，图像视频信息随心存！": "Informações de serviço, imagem e vídeo estão no seu coração!",
|
"服务，图像视频信息随心存！": "Informações de serviço, imagem e vídeo estão no seu coração!",
|
||||||
"图像": "imagem",
|
"图像": "imagem",
|
||||||
"视频": "Vídeo",
|
"视频": "Vídeo"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Atualmente, o país não suporta o registro do código de verificação do telefone celular, use seu endereço de e-mail para se registrar"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Abonament de stocare în cloud",
|
"云存会员": "Abonament de stocare în cloud",
|
||||||
"服务，图像视频信息随心存！": "Serviciile, imaginile și informațiile video sunt în centrul dumneavoastră!",
|
"服务，图像视频信息随心存！": "Serviciile, imaginile și informațiile video sunt în centrul dumneavoastră!",
|
||||||
"图像": "imagine",
|
"图像": "imagine",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "În prezent, țara nu acceptă înregistrarea codului de verificare a telefonului mobil, vă rugăm să utilizați adresa de e-mail pentru a vă înregistra"
|
|
||||||
}
|
}
|
||||||
@ -1171,6 +1171,5 @@
|
|||||||
"云存会员": "Членство в облачном хранилище",
|
"云存会员": "Членство в облачном хранилище",
|
||||||
"服务，图像视频信息随心存！": "Сервисная, имиджевая и видеоинформация в Вашем сердце!",
|
"服务，图像视频信息随心存！": "Сервисная, имиджевая и видеоинформация в Вашем сердце!",
|
||||||
"图像": "образ",
|
"图像": "образ",
|
||||||
"视频": "Видео",
|
"视频": "Видео"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "В настоящее время страна не поддерживает регистрацию кода верификации мобильного телефона, пожалуйста, используйте свой адрес электронной почты для регистрации"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Členstvo v cloudovom úložisku",
|
"云存会员": "Členstvo v cloudovom úložisku",
|
||||||
"服务，图像视频信息随心存！": "Informácie o službách, obrázkoch a videách sú vo vašom srdci!",
|
"服务，图像视频信息随心存！": "Informácie o službách, obrázkoch a videách sú vo vašom srdci!",
|
||||||
"图像": "obraz",
|
"图像": "obraz",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "V súčasnosti krajina nepodporuje registráciu overovacieho kódu mobilného telefónu, na registráciu použite svoju e-mailovú adresu"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Чланство у облаку за складиштење",
|
"云存会员": "Чланство у облаку за складиштење",
|
||||||
"服务，图像视频信息随心存！": "Сервис , слике и видео информације су у вашем срцу!",
|
"服务，图像视频信息随心存！": "Сервис , слике и видео информације су у вашем срцу!",
|
||||||
"图像": "Слика",
|
"图像": "Слика",
|
||||||
"视频": "Пријава",
|
"视频": "Пријава"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Тренутно , земља не подржава регистрацију кода за верификацију мобилног телефона, молимо вас да користите своју адресу е-поште за регистрацију"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Medlemskap i molnlagring",
|
"云存会员": "Medlemskap i molnlagring",
|
||||||
"服务，图像视频信息随心存！": "Service, bild- och videoinformation finns i ditt hjärta!",
|
"服务，图像视频信息随心存！": "Service, bild- och videoinformation finns i ditt hjärta!",
|
||||||
"图像": "bild",
|
"图像": "bild",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "För närvarande stöder landet inte registrering av verifieringskoder för mobiltelefoner, använd din e-postadress för att registrera dig"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "สมาชิกที่เก็บข้อมูลบนคลาวด์",
|
"云存会员": "สมาชิกที่เก็บข้อมูลบนคลาวด์",
|
||||||
"服务，图像视频信息随心存！": "ข้อมูลบริการ รูปภาพ และวิดีโออยู่ที่หัวใจของคุณ!",
|
"服务，图像视频信息随心存！": "ข้อมูลบริการ รูปภาพ และวิดีโออยู่ที่หัวใจของคุณ!",
|
||||||
"图像": "ภาพ",
|
"图像": "ภาพ",
|
||||||
"视频": "วีดิทัศน์",
|
"视频": "วีดิทัศน์"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "ปัจจุบันประเทศไม่รองรับการลงทะเบียนรหัสยืนยันโทรศัพท์มือถือ โปรดใช้ที่อยู่อีเมลของคุณในการลงทะเบียน"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Bulut Depolama Üyeliği",
|
"云存会员": "Bulut Depolama Üyeliği",
|
||||||
"服务，图像视频信息随心存！": "Servis, görüntü ve video bilgileri kalbinizde!",
|
"服务，图像视频信息随心存！": "Servis, görüntü ve video bilgileri kalbinizde!",
|
||||||
"图像": "resim",
|
"图像": "resim",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Şu anda ülke cep telefonu doğrulama kodu kaydını desteklememektedir, lütfen kaydolmak için e-posta adresinizi kullanın"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "雲存會員",
|
"云存会员": "雲存會員",
|
||||||
"服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！",
|
"服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！",
|
||||||
"图像": "圖像",
|
"图像": "圖像",
|
||||||
"视频": "視頻",
|
"视频": "視頻"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "當前國家不支援手機驗證碼註冊，請使用郵箱進行註冊"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Членство в хмарних сховищах",
|
"云存会员": "Членство в хмарних сховищах",
|
||||||
"服务，图像视频信息随心存！": "Сервіс, зображення та відео інформація у вашому серці!",
|
"服务，图像视频信息随心存！": "Сервіс, зображення та відео інформація у вашому серці!",
|
||||||
"图像": "образ",
|
"图像": "образ",
|
||||||
"视频": "Відео",
|
"视频": "Відео"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Наразі країна не підтримує реєстрацію коду підтвердження на мобільному телефоні, будь ласка, використовуйте свою адресу електронної пошти для реєстрації"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Cloud Storage Membership",
|
"云存会员": "Cloud Storage Membership",
|
||||||
"服务，图像视频信息随心存！": "خدمت، تصویر اور ویڈیو کی معلومات آپ کے دل میں ہیں!",
|
"服务，图像视频信息随心存！": "خدمت، تصویر اور ویڈیو کی معلومات آپ کے دل میں ہیں!",
|
||||||
"图像": "روپ",
|
"图像": "روپ",
|
||||||
"视频": "ویڈیو",
|
"视频": "ویڈیو"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "فی الحال، ملک موبائل فون کی توثیقی کوڈ رجسٹریشن کی حمایت نہیں کرتا ہے، براہ کرم رجسٹر کرنے کے لئے اپنا ای میل ایڈریس استعمال کریں"
|
|
||||||
}
|
}
|
||||||
@ -1167,6 +1167,5 @@
|
|||||||
"云存会员": "Tư cách thành viên lưu trữ đám mây",
|
"云存会员": "Tư cách thành viên lưu trữ đám mây",
|
||||||
"服务，图像视频信息随心存！": "Thông tin dịch vụ, hình ảnh và video là trọng tâm của bạn!",
|
"服务，图像视频信息随心存！": "Thông tin dịch vụ, hình ảnh và video là trọng tâm của bạn!",
|
||||||
"图像": "ảnh",
|
"图像": "ảnh",
|
||||||
"视频": "Video",
|
"视频": "Video"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "Hiện tại, quốc gia này không hỗ trợ đăng ký mã xác minh điện thoại di động, vui lòng sử dụng địa chỉ email của bạn để đăng ký"
|
|
||||||
}
|
}
|
||||||
@ -1179,6 +1179,5 @@
|
|||||||
"云存会员": "云存会员",
|
"云存会员": "云存会员",
|
||||||
"服务，图像视频信息随心存！": "服务，图像视频信息随心存！",
|
"服务，图像视频信息随心存！": "服务，图像视频信息随心存！",
|
||||||
"图像": "图像",
|
"图像": "图像",
|
||||||
"视频": "视频",
|
"视频": "视频"
|
||||||
"当前国家不支持手机验证码注册，请使用邮箱进行注册": "当前国家不支持手机验证码注册，请使用邮箱进行注册"
|
|
||||||
}
|
}
|
||||||
@ -16,7 +16,8 @@ import 'io_type.dart';
|
|||||||
import 'reciver_data.dart';
|
import 'reciver_data.dart';
|
||||||
|
|
||||||
//连接状态回调
|
//连接状态回调
|
||||||
typedef ConnectStateCallBack = Function(BluetoothConnectionState connectionState);
|
typedef ConnectStateCallBack = Function(
|
||||||
|
BluetoothConnectionState connectionState);
|
||||||
typedef ScanDevicesCallBack = Function(List<ScanResult>);
|
typedef ScanDevicesCallBack = Function(List<ScanResult>);
|
||||||
|
|
||||||
class BlueManage {
|
class BlueManage {
|
||||||
@ -61,7 +62,8 @@ class BlueManage {
|
|||||||
ScanResult? scanResult;
|
ScanResult? scanResult;
|
||||||
|
|
||||||
// 监听蓝牙连接状态
|
// 监听蓝牙连接状态
|
||||||
BluetoothConnectionState? bluetoothConnectionState = BluetoothConnectionState.disconnected;
|
BluetoothConnectionState? bluetoothConnectionState =
|
||||||
|
BluetoothConnectionState.disconnected;
|
||||||
|
|
||||||
BluetoothAdapterState? _adapterState = BluetoothAdapterState.on;
|
BluetoothAdapterState? _adapterState = BluetoothAdapterState.on;
|
||||||
StreamSubscription<BluetoothAdapterState>? _adapterStateStateSubscription;
|
StreamSubscription<BluetoothAdapterState>? _adapterStateStateSubscription;
|
||||||
@ -101,7 +103,7 @@ class BlueManage {
|
|||||||
// 先取消之前的订阅，避免重复监听
|
// 先取消之前的订阅，避免重复监听
|
||||||
_mtuSubscription?.cancel();
|
_mtuSubscription?.cancel();
|
||||||
_mtuSubscription = null;
|
_mtuSubscription = null;
|
||||||
|
|
||||||
_mtuSubscription = bluetoothConnectDevice!.mtu.listen((int value) {
|
_mtuSubscription = bluetoothConnectDevice!.mtu.listen((int value) {
|
||||||
_mtuSize = value - 3;
|
_mtuSize = value - 3;
|
||||||
AppLog.log('设备MTU变化 - 原始值:$value 计算后MTU:$_mtuSize 设备:${bluetoothConnectDevice?.remoteId.str}');
|
AppLog.log('设备MTU变化 - 原始值:$value 计算后MTU:$_mtuSize 设备:${bluetoothConnectDevice?.remoteId.str}');
|
||||||
@ -109,7 +111,8 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _initAdapterStateStateSubscription() {
|
void _initAdapterStateStateSubscription() {
|
||||||
_adapterStateStateSubscription ??= FlutterBluePlus.adapterState.listen((BluetoothAdapterState state) {
|
_adapterStateStateSubscription ??=
|
||||||
|
FlutterBluePlus.adapterState.listen((BluetoothAdapterState state) {
|
||||||
AppLog.log('蓝牙状态:$state');
|
AppLog.log('蓝牙状态:$state');
|
||||||
_adapterState = state;
|
_adapterState = state;
|
||||||
});
|
});
|
||||||
@ -119,15 +122,18 @@ class BlueManage {
|
|||||||
_connectionStateSubscription?.cancel();
|
_connectionStateSubscription?.cancel();
|
||||||
_connectionStateSubscription = null;
|
_connectionStateSubscription = null;
|
||||||
|
|
||||||
_connectionStateSubscription =
|
_connectionStateSubscription = bluetoothConnectDevice!.connectionState
|
||||||
bluetoothConnectDevice!.connectionState.listen((BluetoothConnectionState state) async {
|
.listen((BluetoothConnectionState state) async {
|
||||||
bluetoothConnectionState = state;
|
bluetoothConnectionState = state;
|
||||||
AppLog.log('蓝牙连接回调状态:$state');
|
AppLog.log('蓝牙连接回调状态:$state');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void _initSendStreamSubscription() {
|
void _initSendStreamSubscription() {
|
||||||
_sendStreamSubscription ??= EventBusManager().eventBus!.on<EventSendModel>().listen((EventSendModel model) {
|
_sendStreamSubscription ??= EventBusManager()
|
||||||
|
.eventBus!
|
||||||
|
.on<EventSendModel>()
|
||||||
|
.listen((EventSendModel model) {
|
||||||
AppLog.log('eventBus接收发送数据:${model}');
|
AppLog.log('eventBus接收发送数据:${model}');
|
||||||
if (model.sendChannel == DataChannel.ble) {
|
if (model.sendChannel == DataChannel.ble) {
|
||||||
FlutterBluePlus.isSupported.then((bool isAvailable) async {
|
FlutterBluePlus.isSupported.then((bool isAvailable) async {
|
||||||
@ -152,7 +158,8 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 开始指定设备名称的扫描蓝牙设备
|
/// 开始指定设备名称的扫描蓝牙设备
|
||||||
Future<void> startScanSingle(String deviceName, int timeout, ScanDevicesCallBack scanDevicesCallBack) async {
|
Future<void> startScanSingle(String deviceName, int timeout,
|
||||||
|
ScanDevicesCallBack scanDevicesCallBack) async {
|
||||||
final DateTime start = DateTime.now();
|
final DateTime start = DateTime.now();
|
||||||
FlutterBluePlus.isSupported.then((bool isAvailable) async {
|
FlutterBluePlus.isSupported.then((bool isAvailable) async {
|
||||||
if (isAvailable) {
|
if (isAvailable) {
|
||||||
@ -160,7 +167,9 @@ class BlueManage {
|
|||||||
if (_adapterState == BluetoothAdapterState.on) {
|
if (_adapterState == BluetoothAdapterState.on) {
|
||||||
try {
|
try {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '开始指定设备名称的扫描蓝牙设备', detail: '调用方法是:startScanSingle 指定设备名称是:$deviceName', upload: false);
|
message: '开始指定设备名称的扫描蓝牙设备',
|
||||||
|
detail: '调用方法是:startScanSingle 指定设备名称是:$deviceName',
|
||||||
|
upload: false);
|
||||||
//android 扫描比较慢，取样只要 3 分之一
|
//android 扫描比较慢，取样只要 3 分之一
|
||||||
final int divisor = Platform.isAndroid ? 3 : 1;
|
final int divisor = Platform.isAndroid ? 3 : 1;
|
||||||
FlutterBluePlus.startScan(
|
FlutterBluePlus.startScan(
|
||||||
@ -172,9 +181,12 @@ class BlueManage {
|
|||||||
final StreamSubscription<List<ScanResult>> subscription =
|
final StreamSubscription<List<ScanResult>> subscription =
|
||||||
FlutterBluePlus.scanResults.listen((List<ScanResult> results) {
|
FlutterBluePlus.scanResults.listen((List<ScanResult> results) {
|
||||||
final bool isExit = results.any((ScanResult element) =>
|
final bool isExit = results.any((ScanResult element) =>
|
||||||
(element.device.platformName == deviceName) || (element.advertisementData.advName == deviceName));
|
(element.device.platformName == deviceName) ||
|
||||||
final int milliseconds = DateTime.now().millisecondsSinceEpoch - start.millisecondsSinceEpoch;
|
(element.advertisementData.advName == deviceName));
|
||||||
AppLog.log('扫描到的设备数:${results.length} 是否查找到 $isExit 以查找$milliseconds毫秒');
|
final int milliseconds = DateTime.now().millisecondsSinceEpoch -
|
||||||
|
start.millisecondsSinceEpoch;
|
||||||
|
AppLog.log(
|
||||||
|
'扫描到的设备数:${results.length} 是否查找到 $isExit 以查找$milliseconds毫秒');
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '指定设备名称的扫描蓝牙设备 监听扫描结果',
|
message: '指定设备名称的扫描蓝牙设备 监听扫描结果',
|
||||||
detail:
|
detail:
|
||||||
@ -190,15 +202,20 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final isMatch = _isMatch(
|
final isMatch = _isMatch(
|
||||||
scanResult.advertisementData.serviceUuids.map((e) => e.uuid).toList(),
|
scanResult.advertisementData.serviceUuids
|
||||||
|
.map((e) => e.uuid)
|
||||||
|
.toList(),
|
||||||
isSingle: true,
|
isSingle: true,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (isMatch && (scanResult.rssi >= -100)) {
|
if (isMatch && (scanResult.rssi >= -100)) {
|
||||||
// 查询id相同的元素
|
// 查询id相同的元素
|
||||||
final int knownDeviceIndex = scanDevices.indexWhere((ScanResult d) =>
|
final int knownDeviceIndex = scanDevices.indexWhere(
|
||||||
(d.device.platformName == scanResult.device.platformName) ||
|
(ScanResult d) =>
|
||||||
(d.advertisementData.advName == scanResult.advertisementData.advName));
|
(d.device.platformName ==
|
||||||
|
scanResult.device.platformName) ||
|
||||||
|
(d.advertisementData.advName ==
|
||||||
|
scanResult.advertisementData.advName));
|
||||||
// 不存在的时候返回-1
|
// 不存在的时候返回-1
|
||||||
if (knownDeviceIndex >= 0) {
|
if (knownDeviceIndex >= 0) {
|
||||||
scanDevices[knownDeviceIndex] = scanResult;
|
scanDevices[knownDeviceIndex] = scanResult;
|
||||||
@ -207,7 +224,8 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '遍历扫描到的结果跟缓存的结果对比，如果有最新的就更新缓存',
|
message: '遍历扫描到的结果跟缓存的结果对比，如果有最新的就更新缓存',
|
||||||
detail: 'startScanSingle deviceName:$deviceName 查询到的结果scanResult:$scanResult',
|
detail:
|
||||||
|
'startScanSingle deviceName:$deviceName 查询到的结果scanResult:$scanResult',
|
||||||
upload: false);
|
upload: false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -216,7 +234,9 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
}, onError: (e) {
|
}, onError: (e) {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '指定设备名称的扫描蓝牙设备 监听扫描结果失败', detail: '打印失败问题 e：${e.toString()}', upload: false);
|
message: '指定设备名称的扫描蓝牙设备 监听扫描结果失败',
|
||||||
|
detail: '打印失败问题 e：${e.toString()}',
|
||||||
|
upload: false);
|
||||||
AppLog.log('扫描失败:$e');
|
AppLog.log('扫描失败:$e');
|
||||||
});
|
});
|
||||||
FlutterBluePlus.cancelWhenScanComplete(subscription);
|
FlutterBluePlus.cancelWhenScanComplete(subscription);
|
||||||
@ -225,7 +245,9 @@ class BlueManage {
|
|||||||
subscription.cancel();
|
subscription.cancel();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '指定设备名称的扫描蓝牙设备 内部逻辑整形失败', detail: 'tartScanSingle内部逻辑整形失败 e:${e.toString()}', upload: false);
|
message: '指定设备名称的扫描蓝牙设备 内部逻辑整形失败',
|
||||||
|
detail: 'tartScanSingle内部逻辑整形失败 e:${e.toString()}',
|
||||||
|
upload: false);
|
||||||
AppLog.log('扫描失败');
|
AppLog.log('扫描失败');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -242,11 +264,12 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 开始扫描蓝牙设备
|
/// 开始扫描蓝牙设备
|
||||||
Future<void> startScan(int timeout, DeviceType deviceType, ScanDevicesCallBack scanDevicesCallBack,
|
Future<void> startScan(int timeout, DeviceType deviceType,
|
||||||
|
ScanDevicesCallBack scanDevicesCallBack,
|
||||||
{List<Guid>? idList}) async {
|
{List<Guid>? idList}) async {
|
||||||
FlutterBluePlus.isSupported.then((bool isAvailable) async {
|
FlutterBluePlus.isSupported.then((bool isAvailable) async {
|
||||||
if (isAvailable) {
|
if (isAvailable) {
|
||||||
AppLog.log('startScan 蓝牙状态 系统蓝牙状态：$_adapterState 蓝牙连接状态：$bluetoothConnectionState');
|
// AppLog.log('startScan 蓝牙状态 系统蓝牙状态：$_adapterState 蓝牙连接状态：$bluetoothConnectionState');
|
||||||
if (_adapterState == BluetoothAdapterState.on) {
|
if (_adapterState == BluetoothAdapterState.on) {
|
||||||
try {
|
try {
|
||||||
FlutterBluePlus.startScan(timeout: Duration(seconds: timeout));
|
FlutterBluePlus.startScan(timeout: Duration(seconds: timeout));
|
||||||
@ -255,23 +278,28 @@ class BlueManage {
|
|||||||
scanDevices.clear();
|
scanDevices.clear();
|
||||||
for (final ScanResult scanResult in results) {
|
for (final ScanResult scanResult in results) {
|
||||||
if (scanResult.advertisementData.serviceUuids.isNotEmpty) {
|
if (scanResult.advertisementData.serviceUuids.isNotEmpty) {
|
||||||
AppLog.log(
|
// AppLog.log(
|
||||||
'扫描到的设备：${scanResult.advertisementData.serviceUuids[0].toString()}====${scanResult.advertisementData.advName}');
|
// '扫描到的设备：${scanResult.advertisementData.serviceUuids[0].toString()}====${scanResult.advertisementData.advName}');
|
||||||
} else {
|
} else {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
final isMatch = _isMatch(
|
final isMatch = _isMatch(
|
||||||
scanResult.advertisementData.serviceUuids.map((e) => e.uuid).toList(),
|
scanResult.advertisementData.serviceUuids
|
||||||
|
.map((e) => e.uuid)
|
||||||
|
.toList(),
|
||||||
deviceType: deviceType,
|
deviceType: deviceType,
|
||||||
isSingle: false,
|
isSingle: false,
|
||||||
);
|
);
|
||||||
// 判断名字为空的直接剔除
|
// 判断名字为空的直接剔除
|
||||||
if (isMatch && (scanResult.rssi >= -100)) {
|
if (isMatch && (scanResult.rssi >= -100)) {
|
||||||
// 查询id相同的元素
|
// 查询id相同的元素
|
||||||
final int knownDeviceIndex = scanDevices.indexWhere((ScanResult d) =>
|
final int knownDeviceIndex = scanDevices.indexWhere(
|
||||||
(d.device.platformName == scanResult.device.platformName) ||
|
(ScanResult d) =>
|
||||||
(d.advertisementData.advName == scanResult.advertisementData.advName));
|
(d.device.platformName ==
|
||||||
|
scanResult.device.platformName) ||
|
||||||
|
(d.advertisementData.advName ==
|
||||||
|
scanResult.advertisementData.advName));
|
||||||
// 不存在的时候返回-1
|
// 不存在的时候返回-1
|
||||||
if (knownDeviceIndex >= 0) {
|
if (knownDeviceIndex >= 0) {
|
||||||
scanDevices[knownDeviceIndex] = scanResult;
|
scanDevices[knownDeviceIndex] = scanResult;
|
||||||
@ -305,8 +333,10 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 判断是否包含指定的uuid
|
/// 判断是否包含指定的uuid
|
||||||
bool _isMatch(List<String> serviceUuids, {DeviceType deviceType = DeviceType.blue, required bool isSingle}) {
|
bool _isMatch(List<String> serviceUuids,
|
||||||
final List<String> prefixes = getDeviceType(deviceType).map((e) => e.toLowerCase()).toList();
|
{DeviceType deviceType = DeviceType.blue, required bool isSingle}) {
|
||||||
|
final List<String> prefixes =
|
||||||
|
getDeviceType(deviceType).map((e) => e.toLowerCase()).toList();
|
||||||
for (String uuid in serviceUuids) {
|
for (String uuid in serviceUuids) {
|
||||||
final String cleanUuid = uuid.toLowerCase();
|
final String cleanUuid = uuid.toLowerCase();
|
||||||
if (cleanUuid.length == 8) {
|
if (cleanUuid.length == 8) {
|
||||||
@ -337,7 +367,8 @@ class BlueManage {
|
|||||||
} else {
|
} else {
|
||||||
// 判断配对状态（带横杠UUID的第31、32位，从1开始计数）
|
// 判断配对状态（带横杠UUID的第31、32位，从1开始计数）
|
||||||
if (cleanUuid.length >= 32) {
|
if (cleanUuid.length >= 32) {
|
||||||
String pairStatus = cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
|
String pairStatus =
|
||||||
|
cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
|
||||||
// 00=未配对，01=已配对
|
// 00=未配对，01=已配对
|
||||||
if (pairStatus == '00') {
|
if (pairStatus == '00') {
|
||||||
return true; // 未配对才返回true
|
return true; // 未配对才返回true
|
||||||
@ -355,11 +386,12 @@ class BlueManage {
|
|||||||
|
|
||||||
// 判断是否有新事件
|
// 判断是否有新事件
|
||||||
bool hasNewEvent = (byte1 == 1);
|
bool hasNewEvent = (byte1 == 1);
|
||||||
|
|
||||||
// 返回是否未配对（原逻辑）
|
// 返回是否未配对（原逻辑）
|
||||||
if (!isPaired) {
|
if (isPaired) {
|
||||||
return true; // 未配对返回true
|
return true; // 已配对返回false
|
||||||
} else {
|
} else {
|
||||||
return false; // 配对返回false
|
return false; // 未配对返回true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 已配对（01）不返回true，继续判断下一个uuid
|
// 已配对（01）不返回true，继续判断下一个uuid
|
||||||
@ -376,7 +408,8 @@ class BlueManage {
|
|||||||
} else {
|
} else {
|
||||||
// 判断配对状态（带横杠UUID的第31、32位，从1开始计数）
|
// 判断配对状态（带横杠UUID的第31、32位，从1开始计数）
|
||||||
if (cleanUuid.length >= 32) {
|
if (cleanUuid.length >= 32) {
|
||||||
String pairStatus = cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
|
String pairStatus =
|
||||||
|
cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
|
||||||
// 00=未配对，01=已配对
|
// 00=未配对，01=已配对
|
||||||
if (pairStatus == '00') {
|
if (pairStatus == '00') {
|
||||||
return true; // 未配对才返回true
|
return true; // 未配对才返回true
|
||||||
@ -395,10 +428,8 @@ class BlueManage {
|
|||||||
|
|
||||||
/// 调用发送数据 List senderData,
|
/// 调用发送数据 List senderData,
|
||||||
Future<void> blueSendData(
|
Future<void> blueSendData(
|
||||||
String deviceName,
|
String deviceName, ConnectStateCallBack stateCallBack,
|
||||||
ConnectStateCallBack stateCallBack, {
|
{bool isAddEquipment = false}) async {
|
||||||
bool isAddEquipment = false,
|
|
||||||
}) async {
|
|
||||||
FlutterBluePlus.isSupported.then((bool isAvailable) async {
|
FlutterBluePlus.isSupported.then((bool isAvailable) async {
|
||||||
if (isAvailable) {
|
if (isAvailable) {
|
||||||
// AppLog.log('蓝牙状态 系统蓝牙状态：$_adapterState 蓝牙连接状态：$bluetoothConnectionState');
|
// AppLog.log('蓝牙状态 系统蓝牙状态：$_adapterState 蓝牙连接状态：$bluetoothConnectionState');
|
||||||
@ -407,16 +438,12 @@ class BlueManage {
|
|||||||
if (bluetoothConnectionState != BluetoothConnectionState.connected) {
|
if (bluetoothConnectionState != BluetoothConnectionState.connected) {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '点击按钮 蓝牙未连接 下一步扫描连接蓝牙',
|
message: '点击按钮 蓝牙未连接 下一步扫描连接蓝牙',
|
||||||
detail: 'blueSendData 蓝牙连接状态 bluetoothConnectionState：$bluetoothConnectionState deviceName:$deviceName',
|
detail:
|
||||||
|
'blueSendData 蓝牙连接状态 bluetoothConnectionState：$bluetoothConnectionState deviceName:$deviceName',
|
||||||
upload: false);
|
upload: false);
|
||||||
// 连接设备
|
_connect(deviceName, (BluetoothConnectionState state) {
|
||||||
_connect(
|
stateCallBack(bluetoothConnectionState!);
|
||||||
deviceName,
|
}, isAddEquipment: isAddEquipment);
|
||||||
(BluetoothConnectionState state) {
|
|
||||||
stateCallBack(bluetoothConnectionState!);
|
|
||||||
},
|
|
||||||
isAddEquipment: isAddEquipment,
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '点击按钮 蓝牙已经连接 下一步扫描连接蓝牙',
|
message: '点击按钮 蓝牙已经连接 下一步扫描连接蓝牙',
|
||||||
@ -428,7 +455,8 @@ class BlueManage {
|
|||||||
} else {
|
} else {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '点击按钮 蓝牙未打开',
|
message: '点击按钮 蓝牙未打开',
|
||||||
detail: 'blueSendData 蓝牙未打开--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName',
|
detail:
|
||||||
|
'blueSendData 蓝牙未打开--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName',
|
||||||
upload: false);
|
upload: false);
|
||||||
try {
|
try {
|
||||||
stateCallBack(BluetoothConnectionState.disconnected);
|
stateCallBack(BluetoothConnectionState.disconnected);
|
||||||
@ -437,13 +465,16 @@ class BlueManage {
|
|||||||
AppLog.log('蓝牙打开失败');
|
AppLog.log('蓝牙打开失败');
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '点击按钮 蓝牙未打开 然后蓝牙打开失败',
|
message: '点击按钮 蓝牙未打开 然后蓝牙打开失败',
|
||||||
detail: 'blueSendData 蓝牙打开失败--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName',
|
detail:
|
||||||
|
'blueSendData 蓝牙打开失败--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName',
|
||||||
upload: false);
|
upload: false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '点击按钮 蓝牙状态不可用', detail: 'blueSendData 蓝牙状态不可用--isAvailable:$isAvailable', upload: false);
|
message: '点击按钮 蓝牙状态不可用',
|
||||||
|
detail: 'blueSendData 蓝牙状态不可用--isAvailable:$isAvailable',
|
||||||
|
upload: false);
|
||||||
stateCallBack(BluetoothConnectionState.disconnected);
|
stateCallBack(BluetoothConnectionState.disconnected);
|
||||||
AppLog.log('开始扫描 蓝牙不可用，不能进行蓝牙操作');
|
AppLog.log('开始扫描 蓝牙不可用，不能进行蓝牙操作');
|
||||||
}
|
}
|
||||||
@ -451,7 +482,8 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 连接
|
/// 连接
|
||||||
Future<void> _connect(String deviceName, ConnectStateCallBack connectStateCallBack,
|
Future<void> _connect(
|
||||||
|
String deviceName, ConnectStateCallBack connectStateCallBack,
|
||||||
{bool isAddEquipment = false}) async {
|
{bool isAddEquipment = false}) async {
|
||||||
connectDeviceName = deviceName;
|
connectDeviceName = deviceName;
|
||||||
// 当前已扫描到的缓存设备
|
// 当前已扫描到的缓存设备
|
||||||
@ -459,12 +491,16 @@ class BlueManage {
|
|||||||
// 是否有缓存设备 true是有缓存设备
|
// 是否有缓存设备 true是有缓存设备
|
||||||
final bool isExistDevice = isExistScanDevices(connectDeviceName);
|
final bool isExistDevice = isExistScanDevices(connectDeviceName);
|
||||||
// 是否是当前设备
|
// 是否是当前设备
|
||||||
final bool isCurrentDevice = CommonDataManage().currentKeyInfo.lockName == deviceName;
|
final bool isCurrentDevice =
|
||||||
|
CommonDataManage().currentKeyInfo.lockName == deviceName;
|
||||||
// mac地址
|
// mac地址
|
||||||
final String? mac = CommonDataManage().currentKeyInfo.mac;
|
final String? mac = CommonDataManage().currentKeyInfo.mac;
|
||||||
|
|
||||||
AppLog.log('开始连接 是否存在缓存：$isExistDevice 是否是当前设备：$isCurrentDevice mac：$mac');
|
AppLog.log('开始连接 是否存在缓存：$isExistDevice 是否是当前设备：$isCurrentDevice mac：$mac');
|
||||||
if (GetPlatform.isAndroid && !isExistDevice && isCurrentDevice && mac != null) {
|
if (GetPlatform.isAndroid &&
|
||||||
|
!isExistDevice &&
|
||||||
|
isCurrentDevice &&
|
||||||
|
mac != null) {
|
||||||
// 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空
|
// 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
|
message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
|
||||||
@ -476,17 +512,22 @@ class BlueManage {
|
|||||||
try {
|
try {
|
||||||
if (!needScanSingle) {
|
if (!needScanSingle) {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
|
message:
|
||||||
|
'开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
|
||||||
detail: '调用方法doNotSearchBLE，直接连接,needScanSingle：$needScanSingle',
|
detail: '调用方法doNotSearchBLE，直接连接,needScanSingle：$needScanSingle',
|
||||||
upload: false);
|
upload: false);
|
||||||
await doNotSearchBLE(mac, connectStateCallBack, isAddEquipment: isAddEquipment);
|
await doNotSearchBLE(mac, connectStateCallBack,
|
||||||
|
isAddEquipment: isAddEquipment);
|
||||||
} else {
|
} else {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
|
message:
|
||||||
detail: '调用方法startScanSingle，执行扫描函数,needScanSingle：$needScanSingle',
|
'开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
|
||||||
|
detail:
|
||||||
|
'调用方法startScanSingle，执行扫描函数,needScanSingle：$needScanSingle',
|
||||||
upload: false);
|
upload: false);
|
||||||
startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
|
startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
|
||||||
_connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment);
|
_connectDevice(scanDevices, deviceName, connectStateCallBack,
|
||||||
|
isAddEquipment: isAddEquipment);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@ -495,7 +536,8 @@ class BlueManage {
|
|||||||
detail: '调用方法doNotSearchBLE发生异常，执行扫描函数 startScanSingle，异常信息：$e',
|
detail: '调用方法doNotSearchBLE发生异常，执行扫描函数 startScanSingle，异常信息：$e',
|
||||||
upload: false);
|
upload: false);
|
||||||
startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
|
startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
|
||||||
_connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment);
|
_connectDevice(scanDevices, deviceName, connectStateCallBack,
|
||||||
|
isAddEquipment: isAddEquipment);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
@ -512,13 +554,16 @@ class BlueManage {
|
|||||||
} else if (isAddEquipment == false && isExistDevice == false) {
|
} else if (isAddEquipment == false && isExistDevice == false) {
|
||||||
// 取消缓存直接使用，存在配对场景设备信息会更变
|
// 取消缓存直接使用，存在配对场景设备信息会更变
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '取消缓存直接使用，存在配对场景设备信息会更变 然后开始指定设备名称的扫描蓝牙设备 上传记录当前方法是：_connect',
|
message:
|
||||||
detail: '符合条件(isAddEquipment == false && isExistDevice == false) 下一步调用startScanSingle',
|
'取消缓存直接使用，存在配对场景设备信息会更变 然后开始指定设备名称的扫描蓝牙设备 上传记录当前方法是：_connect',
|
||||||
|
detail:
|
||||||
|
'符合条件(isAddEquipment == false && isExistDevice == false) 下一步调用startScanSingle',
|
||||||
upload: false);
|
upload: false);
|
||||||
|
|
||||||
// AppLog.log('无存在设备需要扫描 deviceName:$deviceName isAddEquipment:$isAddEquipment');
|
// AppLog.log('无存在设备需要扫描 deviceName:$deviceName isAddEquipment:$isAddEquipment');
|
||||||
startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
|
startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
|
||||||
_connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment);
|
_connectDevice(scanDevices, deviceName, connectStateCallBack,
|
||||||
|
isAddEquipment: isAddEquipment);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
@ -527,14 +572,16 @@ class BlueManage {
|
|||||||
'走这个方法是有缓存或者添加设备的时候以及不符合(GetPlatform.isAndroid && !isExistDevice && isCurrentDevice && mac != null) deviceName:$deviceName 直接调用_connectDevice',
|
'走这个方法是有缓存或者添加设备的时候以及不符合(GetPlatform.isAndroid && !isExistDevice && isCurrentDevice && mac != null) deviceName:$deviceName 直接调用_connectDevice',
|
||||||
upload: false);
|
upload: false);
|
||||||
// AppLog.log('安卓或者iOS 存在设备不需要扫描 deviceName:$deviceName isAddEquipment:$isAddEquipment');
|
// AppLog.log('安卓或者iOS 存在设备不需要扫描 deviceName:$deviceName isAddEquipment:$isAddEquipment');
|
||||||
_connectDevice(devicesList, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment);
|
_connectDevice(devicesList, deviceName, connectStateCallBack,
|
||||||
|
isAddEquipment: isAddEquipment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//查找缓存里面是否有设备
|
//查找缓存里面是否有设备
|
||||||
bool isExistScanDevices(String connectDeviceName) {
|
bool isExistScanDevices(String connectDeviceName) {
|
||||||
final bool isExistDevice = scanDevices.any((ScanResult element) =>
|
final bool isExistDevice = scanDevices.any((ScanResult element) =>
|
||||||
element.device.platformName == connectDeviceName || element.advertisementData.advName == connectDeviceName);
|
element.device.platformName == connectDeviceName ||
|
||||||
|
element.advertisementData.advName == connectDeviceName);
|
||||||
return isExistDevice;
|
return isExistDevice;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -548,15 +595,17 @@ class BlueManage {
|
|||||||
// 判断数组列表里面是否有这个设备
|
// 判断数组列表里面是否有这个设备
|
||||||
// AppLog.log("devicesList:$devicesList");
|
// AppLog.log("devicesList:$devicesList");
|
||||||
|
|
||||||
final int knownDeviceIndex = devicesList.indexWhere(
|
final int knownDeviceIndex = devicesList.indexWhere((ScanResult d) =>
|
||||||
(ScanResult d) => (d.device.platformName == deviceName) || (d.advertisementData.advName == deviceName));
|
(d.device.platformName == deviceName) ||
|
||||||
|
(d.advertisementData.advName == deviceName));
|
||||||
|
|
||||||
ScanResult? scanResult; //使用局部变量防止出现缓存
|
ScanResult? scanResult; //使用局部变量防止出现缓存
|
||||||
if (knownDeviceIndex >= 0) {
|
if (knownDeviceIndex >= 0) {
|
||||||
// 存在的时候赋值
|
// 存在的时候赋值
|
||||||
connectDeviceMacAddress = devicesList[knownDeviceIndex].advertisementData.advName.isNotEmpty
|
connectDeviceMacAddress =
|
||||||
? devicesList[knownDeviceIndex].advertisementData.advName
|
devicesList[knownDeviceIndex].advertisementData.advName.isNotEmpty
|
||||||
: devicesList[knownDeviceIndex].device.platformName;
|
? devicesList[knownDeviceIndex].advertisementData.advName
|
||||||
|
: devicesList[knownDeviceIndex].device.platformName;
|
||||||
|
|
||||||
bluetoothConnectDevice = devicesList[knownDeviceIndex].device;
|
bluetoothConnectDevice = devicesList[knownDeviceIndex].device;
|
||||||
scanResult = devicesList[knownDeviceIndex];
|
scanResult = devicesList[knownDeviceIndex];
|
||||||
@ -567,8 +616,10 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
if (scanResult == null || connectDeviceMacAddress.isEmpty) {
|
if (scanResult == null || connectDeviceMacAddress.isEmpty) {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '扫描结果scanResult == null || connectDeviceMacAddress.isEmpty不往下执行 return 上传记录当前方法是：_connectDevice',
|
message:
|
||||||
detail: 'scanResult:$scanResult connectDeviceMacAddress：$connectDeviceMacAddress',
|
'扫描结果scanResult == null || connectDeviceMacAddress.isEmpty不往下执行 return 上传记录当前方法是：_connectDevice',
|
||||||
|
detail:
|
||||||
|
'scanResult:$scanResult connectDeviceMacAddress：$connectDeviceMacAddress',
|
||||||
upload: false);
|
upload: false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -602,7 +653,8 @@ class BlueManage {
|
|||||||
|
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '提示该锁已被重置, 回调断开连接, 清除缓存，上传记录当前方法是：_connectDevice',
|
message: '提示该锁已被重置, 回调断开连接, 清除缓存，上传记录当前方法是：_connectDevice',
|
||||||
detail: 'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}',
|
detail:
|
||||||
|
'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}',
|
||||||
upload: false);
|
upload: false);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@ -634,7 +686,8 @@ class BlueManage {
|
|||||||
|
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '提示该锁已被重置, 回调断开连接, 清除缓存，上传记录当前方法是：_connectDevice',
|
message: '提示该锁已被重置, 回调断开连接, 清除缓存，上传记录当前方法是：_connectDevice',
|
||||||
detail: 'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}',
|
detail:
|
||||||
|
'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}',
|
||||||
upload: false);
|
upload: false);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@ -651,11 +704,13 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//直接给蓝牙设备写入
|
//直接给蓝牙设备写入
|
||||||
Future<void> doNotSearchBLE(String masAdds, ConnectStateCallBack connectStateCallBack,
|
Future<void> doNotSearchBLE(
|
||||||
|
String masAdds, ConnectStateCallBack connectStateCallBack,
|
||||||
{bool isAddEquipment = false}) async {
|
{bool isAddEquipment = false}) async {
|
||||||
await FlutterBluePlus.stopScan();
|
await FlutterBluePlus.stopScan();
|
||||||
|
|
||||||
if (bluetoothConnectDevice == null || bluetoothConnectDevice?.remoteId.str != masAdds) {
|
if (bluetoothConnectDevice == null ||
|
||||||
|
bluetoothConnectDevice?.remoteId.str != masAdds) {
|
||||||
bluetoothConnectDevice = BluetoothDevice.fromId(masAdds);
|
bluetoothConnectDevice = BluetoothDevice.fromId(masAdds);
|
||||||
_initGetMtuSubscription();
|
_initGetMtuSubscription();
|
||||||
_initListenConnectionState();
|
_initListenConnectionState();
|
||||||
@ -666,24 +721,25 @@ class BlueManage {
|
|||||||
} else {
|
} else {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '直接给蓝牙设备写入 上传记录当前方法是：doNotSearchBLE',
|
message: '直接给蓝牙设备写入 上传记录当前方法是：doNotSearchBLE',
|
||||||
detail: '直接给蓝牙设备写入 用传入的bluetoothConnectDevice：${bluetoothConnectDevice.toString()}连接 masAdds:$masAdds',
|
detail:
|
||||||
|
'直接给蓝牙设备写入 用传入的bluetoothConnectDevice：${bluetoothConnectDevice.toString()}连接 masAdds:$masAdds',
|
||||||
upload: false);
|
upload: false);
|
||||||
}
|
}
|
||||||
//尝试连接设备
|
//尝试连接设备
|
||||||
await bluetoothDeviceConnect(bluetoothConnectDevice!, connectStateCallBack, isAddEquipment: isAddEquipment);
|
await bluetoothDeviceConnect(bluetoothConnectDevice!, connectStateCallBack,
|
||||||
|
isAddEquipment: isAddEquipment);
|
||||||
}
|
}
|
||||||
|
|
||||||
//设备连接
|
//设备连接
|
||||||
Future<void> bluetoothDeviceConnect(BluetoothDevice bluetoothConnectDevice, ConnectStateCallBack connectStateCallBack,
|
Future<void> bluetoothDeviceConnect(BluetoothDevice bluetoothConnectDevice,
|
||||||
|
ConnectStateCallBack connectStateCallBack,
|
||||||
{bool isAddEquipment = false}) async {
|
{bool isAddEquipment = false}) async {
|
||||||
// 重连三次
|
// 重连三次
|
||||||
const int maxAttempts = 3;
|
const int maxAttempts = 3;
|
||||||
int attempt = 0;
|
int attempt = 0;
|
||||||
while (attempt < maxAttempts) {
|
while (attempt < maxAttempts) {
|
||||||
try {
|
try {
|
||||||
await bluetoothConnectDevice.connect(
|
await bluetoothConnectDevice.connect(timeout: 5.seconds);
|
||||||
timeout: 5.seconds,
|
|
||||||
);
|
|
||||||
break; // If the connection is successful, break the loop
|
break; // If the connection is successful, break the loop
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
AppLog.log('连接失败 重连了: $e');
|
AppLog.log('连接失败 重连了: $e');
|
||||||
@ -698,7 +754,8 @@ class BlueManage {
|
|||||||
AppLog.log('$maxAttempts次后尝试连接失败');
|
AppLog.log('$maxAttempts次后尝试连接失败');
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '连接三次超时断开连接 回调断开连接 上传记录当前方法是：bluetoothDeviceConnect',
|
message: '连接三次超时断开连接 回调断开连接 上传记录当前方法是：bluetoothDeviceConnect',
|
||||||
detail: 'bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} $maxAttempts次后尝试连接失败',
|
detail:
|
||||||
|
'bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} $maxAttempts次后尝试连接失败',
|
||||||
upload: false);
|
upload: false);
|
||||||
needScanSingle = true;
|
needScanSingle = true;
|
||||||
connectStateCallBack(BluetoothConnectionState.disconnected);
|
connectStateCallBack(BluetoothConnectionState.disconnected);
|
||||||
@ -707,18 +764,22 @@ class BlueManage {
|
|||||||
if (bluetoothConnectionState == BluetoothConnectionState.connected) {
|
if (bluetoothConnectionState == BluetoothConnectionState.connected) {
|
||||||
try {
|
try {
|
||||||
needScanSingle = false;
|
needScanSingle = false;
|
||||||
final List<BluetoothService> services = await bluetoothConnectDevice.discoverServices();
|
final List<BluetoothService> services =
|
||||||
|
await bluetoothConnectDevice.discoverServices();
|
||||||
//循环判断服务
|
//循环判断服务
|
||||||
for (final BluetoothService service in services) {
|
for (final BluetoothService service in services) {
|
||||||
if (service.uuid == _serviceIdConnect) {
|
if (service.uuid == _serviceIdConnect) {
|
||||||
for (final BluetoothCharacteristic characteristic in service.characteristics) {
|
for (final BluetoothCharacteristic characteristic
|
||||||
if (characteristic.characteristicUuid == _characteristicIdSubscription) {
|
in service.characteristics) {
|
||||||
|
if (characteristic.characteristicUuid ==
|
||||||
|
_characteristicIdSubscription) {
|
||||||
_subScribeToCharacteristic(characteristic);
|
_subScribeToCharacteristic(characteristic);
|
||||||
bluetoothConnectionState = BluetoothConnectionState.connected;
|
bluetoothConnectionState = BluetoothConnectionState.connected;
|
||||||
connectStateCallBack(bluetoothConnectionState!);
|
connectStateCallBack(bluetoothConnectionState!);
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '订阅成功 上传记录当前方法是：bluetoothDeviceConnect',
|
message: '订阅成功 上传记录当前方法是：bluetoothDeviceConnect',
|
||||||
detail: '发现服务，连接成功，订阅数据 bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} ',
|
detail:
|
||||||
|
'发现服务，连接成功，订阅数据 bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} ',
|
||||||
upload: false);
|
upload: false);
|
||||||
} else {
|
} else {
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
@ -740,18 +801,22 @@ class BlueManage {
|
|||||||
needScanSingle = true;
|
needScanSingle = true;
|
||||||
bluetoothConnectionState = BluetoothConnectionState.disconnected;
|
bluetoothConnectionState = BluetoothConnectionState.disconnected;
|
||||||
connectStateCallBack(bluetoothConnectionState!);
|
connectStateCallBack(bluetoothConnectionState!);
|
||||||
AppLog.log('发现设备时失败 e:$e bluetoothConnectionState:$bluetoothConnectionState');
|
AppLog.log(
|
||||||
|
'发现设备时失败 e:$e bluetoothConnectionState:$bluetoothConnectionState');
|
||||||
BuglyTool.uploadException(
|
BuglyTool.uploadException(
|
||||||
message: '发现服务时失败',
|
message: '发现服务时失败',
|
||||||
detail: '发现服务时报错原因e：$e bluetoothDeviceConnect:${bluetoothConnectDevice.toString()}',
|
detail:
|
||||||
|
'发现服务时报错原因e：$e bluetoothDeviceConnect:${bluetoothConnectDevice.toString()}',
|
||||||
upload: false);
|
upload: false);
|
||||||
rethrow;
|
rethrow;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _subScribeToCharacteristic(BluetoothCharacteristic characteristic) async {
|
Future<void> _subScribeToCharacteristic(
|
||||||
final StreamSubscription<List<int>> subscription = characteristic.onValueReceived.listen((List<int> data) {
|
BluetoothCharacteristic characteristic) async {
|
||||||
|
final StreamSubscription<List<int>> subscription =
|
||||||
|
characteristic.onValueReceived.listen((List<int> data) {
|
||||||
AppLog.log('订阅获取的数据： $data ');
|
AppLog.log('订阅获取的数据： $data ');
|
||||||
if (data == lastTimeData || data.isEmpty) {
|
if (data == lastTimeData || data.isEmpty) {
|
||||||
return;
|
return;
|
||||||
@ -799,7 +864,10 @@ class BlueManage {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//239, 1, 238, 2, 是数据包头
|
//239, 1, 238, 2, 是数据包头
|
||||||
if ((data[0] == 0xEF) && (data[1] == 0x01) && (data[2] == 0xEE) && (data[3] == 0x02)) {
|
if ((data[0] == 0xEF) &&
|
||||||
|
(data[1] == 0x01) &&
|
||||||
|
(data[2] == 0xEE) &&
|
||||||
|
(data[3] == 0x02)) {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
@ -808,10 +876,12 @@ class BlueManage {
|
|||||||
|
|
||||||
/// 写入蓝牙特征值，并等待响应
|
/// 写入蓝牙特征值，并等待响应
|
||||||
Future<void> writeCharacteristicWithResponse(List<int> value) async {
|
Future<void> writeCharacteristicWithResponse(List<int> value) async {
|
||||||
final List<BluetoothService> services = await bluetoothConnectDevice!.discoverServices();
|
final List<BluetoothService> services =
|
||||||
|
await bluetoothConnectDevice!.discoverServices();
|
||||||
for (final BluetoothService service in services) {
|
for (final BluetoothService service in services) {
|
||||||
if (service.uuid == _serviceIdConnect) {
|
if (service.uuid == _serviceIdConnect) {
|
||||||
for (final BluetoothCharacteristic characteristic in service.characteristics) {
|
for (final BluetoothCharacteristic characteristic
|
||||||
|
in service.characteristics) {
|
||||||
if (characteristic.characteristicUuid == _characteristicIdWrite) {
|
if (characteristic.characteristicUuid == _characteristicIdWrite) {
|
||||||
try {
|
try {
|
||||||
// 添加重试机制
|
// 添加重试机制
|
||||||
@ -830,22 +900,27 @@ class BlueManage {
|
|||||||
while (!packetSent && retryCount < maxRetries) {
|
while (!packetSent && retryCount < maxRetries) {
|
||||||
try {
|
try {
|
||||||
if (characteristic.properties.writeWithoutResponse) {
|
if (characteristic.properties.writeWithoutResponse) {
|
||||||
await characteristic.write(subData[i], withoutResponse: true);
|
await characteristic.write(subData[i],
|
||||||
|
withoutResponse: true);
|
||||||
} else if (characteristic.properties.write) {
|
} else if (characteristic.properties.write) {
|
||||||
await characteristic.write(subData[i]);
|
await characteristic.write(subData[i]);
|
||||||
} else {
|
} else {
|
||||||
// 特性不支持写入
|
// 特性不支持写入
|
||||||
throw Exception('This characteristic does not support writing.');
|
throw Exception(
|
||||||
|
'This characteristic does not support writing.');
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果到这里没有异常，则包发送成功
|
// 如果到这里没有异常，则包发送成功
|
||||||
packetSent = true;
|
packetSent = true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e.toString().contains('UNKNOWN_GATT_ERROR (133)') && retryCount < maxRetries - 1) {
|
if (e.toString().contains('UNKNOWN_GATT_ERROR (133)') &&
|
||||||
|
retryCount < maxRetries - 1) {
|
||||||
// GATT错误133，尝试重试
|
// GATT错误133，尝试重试
|
||||||
retryCount++;
|
retryCount++;
|
||||||
AppLog.log('蓝牙写入失败(GATT 133)，数据包 ${i + 1}/${subData.length} 正在重试 $retryCount/$maxRetries...');
|
AppLog.log(
|
||||||
await Future.delayed(Duration(milliseconds: retryDelayMs));
|
'蓝牙写入失败(GATT 133)，数据包 ${i + 1}/${subData.length} 正在重试 $retryCount/$maxRetries...');
|
||||||
|
await Future.delayed(
|
||||||
|
Duration(milliseconds: retryDelayMs));
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
// 其他错误或已达到最大重试次数，抛出异常
|
// 其他错误或已达到最大重试次数，抛出异常
|
||||||
@ -856,7 +931,8 @@ class BlueManage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!packetSent) {
|
if (!packetSent) {
|
||||||
throw Exception('蓝牙写入失败，数据包 ${i + 1}/${subData.length} 已达到最大重试次数');
|
throw Exception(
|
||||||
|
'蓝牙写入失败，数据包 ${i + 1}/${subData.length} 已达到最大重试次数');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -888,19 +964,21 @@ class BlueManage {
|
|||||||
Future<void> disconnect() async {
|
Future<void> disconnect() async {
|
||||||
try {
|
try {
|
||||||
connectDeviceMacAddress = '';
|
connectDeviceMacAddress = '';
|
||||||
|
|
||||||
// 清理MTU监听
|
// 清理MTU监听
|
||||||
_mtuSubscription?.cancel();
|
_mtuSubscription?.cancel();
|
||||||
_mtuSubscription = null;
|
_mtuSubscription = null;
|
||||||
_mtuSize = 20; // 重置MTU为默认值
|
_mtuSize = 20; // 重置MTU为默认值
|
||||||
|
|
||||||
if (bluetoothConnectionState == BluetoothConnectionState.connected) {
|
if (bluetoothConnectionState == BluetoothConnectionState.connected) {
|
||||||
AppLog.log('请求断开蓝牙连接');
|
|
||||||
//加快蓝牙断连
|
//加快蓝牙断连
|
||||||
await bluetoothConnectDevice!.disconnect(timeout: 1);
|
await bluetoothConnectDevice!.disconnect(timeout: 3);
|
||||||
|
AppLog.log('断开连接成功');
|
||||||
}
|
}
|
||||||
} on Exception catch (e, _) {
|
} on Exception catch (e, _) {
|
||||||
AppLog.log('断开连接失败: $e');
|
AppLog.log('断开连接失败: $e');
|
||||||
|
} finally {
|
||||||
|
bluetoothConnectionState = BluetoothConnectionState.disconnected;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -928,7 +1006,7 @@ class BlueManage {
|
|||||||
_mtuSubscription?.cancel();
|
_mtuSubscription?.cancel();
|
||||||
_adapterStateStateSubscription?.cancel();
|
_adapterStateStateSubscription?.cancel();
|
||||||
_connectionStateSubscription?.cancel();
|
_connectionStateSubscription?.cancel();
|
||||||
|
|
||||||
// 重置状态
|
// 重置状态
|
||||||
_mtuSize = 20;
|
_mtuSize = 20;
|
||||||
connectDeviceName = '';
|
connectDeviceName = '';
|
||||||
|
|||||||
@ -165,7 +165,6 @@ class LockDetailLogic extends BaseGetXController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_handleSynchronizeUploadLockData();
|
_handleSynchronizeUploadLockData();
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 0x06:
|
case 0x06:
|
||||||
//无权限
|
//无权限
|
||||||
@ -929,31 +928,28 @@ class LockDetailLogic extends BaseGetXController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _handleGetLockPasswordData() {
|
void _handleGetLockPasswordData() {
|
||||||
BlueManage().blueSendData(
|
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
||||||
BlueManage().connectDeviceName,
|
if (connectionState == BluetoothConnectionState.connected) {
|
||||||
(BluetoothConnectionState connectionState) async {
|
final List<String>? token = await Storage.getStringList(saveBlueToken);
|
||||||
if (connectionState == BluetoothConnectionState.connected) {
|
final List<int> getTokenList = changeStringListToIntList(token!);
|
||||||
final List<String>? token = await Storage.getStringList(saveBlueToken);
|
|
||||||
final List<int> getTokenList = changeStringListToIntList(token!);
|
|
||||||
|
|
||||||
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
||||||
final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
|
final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
|
||||||
|
|
||||||
final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
|
final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
|
||||||
final List<int> signKeyDataList = changeStringListToIntList(signKey!);
|
final List<int> signKeyDataList = changeStringListToIntList(signKey!);
|
||||||
|
|
||||||
IoSenderManage.updataLockPasswordListCommand(
|
IoSenderManage.updataLockPasswordListCommand(
|
||||||
lockID: BlueManage().connectDeviceName,
|
lockID: BlueManage().connectDeviceName,
|
||||||
userID: await Storage.getUid(),
|
userID: await Storage.getUid(),
|
||||||
page: state.uploadPasswordPage,
|
page: state.uploadPasswordPage,
|
||||||
countReq: state.countReq,
|
countReq: state.countReq,
|
||||||
token: getTokenList,
|
token: getTokenList,
|
||||||
needAuthor: 1,
|
needAuthor: 1,
|
||||||
signKey: signKeyDataList,
|
signKey: signKeyDataList,
|
||||||
privateKey: getPrivateKeyList);
|
privateKey: getPrivateKeyList);
|
||||||
}
|
}
|
||||||
},
|
});
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 上传数据获取锁密码列表
|
// 上传数据获取锁密码列表
|
||||||
@ -967,7 +963,7 @@ class LockDetailLogic extends BaseGetXController {
|
|||||||
// 当数据是10的时候继续请求
|
// 当数据是10的时候继续请求
|
||||||
state.uploadPasswordPage = state.uploadPasswordPage + 1;
|
state.uploadPasswordPage = state.uploadPasswordPage + 1;
|
||||||
final List<int> token = reply.data.sublist(3, 7);
|
final List<int> token = reply.data.sublist(3, 7);
|
||||||
|
showEasyLoading();
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
||||||
if (connectionState == BluetoothConnectionState.connected) {
|
if (connectionState == BluetoothConnectionState.connected) {
|
||||||
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
||||||
@ -1071,6 +1067,7 @@ class LockDetailLogic extends BaseGetXController {
|
|||||||
|
|
||||||
final List<int> token = reply.data.sublist(3, 7);
|
final List<int> token = reply.data.sublist(3, 7);
|
||||||
|
|
||||||
|
showEasyLoading();
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
||||||
if (connectionState == BluetoothConnectionState.connected) {
|
if (connectionState == BluetoothConnectionState.connected) {
|
||||||
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
||||||
@ -1174,6 +1171,7 @@ class LockDetailLogic extends BaseGetXController {
|
|||||||
|
|
||||||
final List<int> token = reply.data.sublist(3, 7);
|
final List<int> token = reply.data.sublist(3, 7);
|
||||||
|
|
||||||
|
showEasyLoading();
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
||||||
if (connectionState == BluetoothConnectionState.connected) {
|
if (connectionState == BluetoothConnectionState.connected) {
|
||||||
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
||||||
@ -1327,6 +1325,7 @@ class LockDetailLogic extends BaseGetXController {
|
|||||||
|
|
||||||
final List<int> token = reply.data.sublist(3, 7);
|
final List<int> token = reply.data.sublist(3, 7);
|
||||||
|
|
||||||
|
showEasyLoading();
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
||||||
if (connectionState == BluetoothConnectionState.connected) {
|
if (connectionState == BluetoothConnectionState.connected) {
|
||||||
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
||||||
@ -1403,6 +1402,7 @@ class LockDetailLogic extends BaseGetXController {
|
|||||||
|
|
||||||
final List<int> token = reply.data.sublist(3, 7);
|
final List<int> token = reply.data.sublist(3, 7);
|
||||||
|
|
||||||
|
showEasyLoading();
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
||||||
if (connectionState == BluetoothConnectionState.connected) {
|
if (connectionState == BluetoothConnectionState.connected) {
|
||||||
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
||||||
@ -1479,6 +1479,7 @@ class LockDetailLogic extends BaseGetXController {
|
|||||||
|
|
||||||
final List<int> token = reply.data.sublist(3, 7);
|
final List<int> token = reply.data.sublist(3, 7);
|
||||||
|
|
||||||
|
showEasyLoading();
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
|
||||||
if (connectionState == BluetoothConnectionState.connected) {
|
if (connectionState == BluetoothConnectionState.connected) {
|
||||||
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
||||||
@ -1502,8 +1503,6 @@ class LockDetailLogic extends BaseGetXController {
|
|||||||
} else {
|
} else {
|
||||||
state.indexCount.value = state.indexCount.value + 1;
|
state.indexCount.value = state.indexCount.value + 1;
|
||||||
_lockDataUpload(uploadType: 2, recordType: 7, records: state.uploadRemoteControlDataList);
|
_lockDataUpload(uploadType: 2, recordType: 7, records: state.uploadRemoteControlDataList);
|
||||||
AppLog.log('需要执行断开操作');
|
|
||||||
BlueManage().disconnect();
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 0x06:
|
case 0x06:
|
||||||
|
|||||||
@ -45,7 +45,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
@override
|
@override
|
||||||
void onInit() async {
|
void onInit() async {
|
||||||
super.onInit();
|
super.onInit();
|
||||||
_replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
|
_replySubscription =
|
||||||
|
EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
|
||||||
if (reply is VoicePackageConfigureReply) {
|
if (reply is VoicePackageConfigureReply) {
|
||||||
// 语言包配置开始
|
// 语言包配置开始
|
||||||
_handlerStartVoicePackageConfigure(reply);
|
_handlerStartVoicePackageConfigure(reply);
|
||||||
@ -71,7 +72,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
final vendor = state.lockSetInfoData.value.lockBasicInfo?.vendor;
|
final vendor = state.lockSetInfoData.value.lockBasicInfo?.vendor;
|
||||||
final model = state.lockSetInfoData.value.lockBasicInfo?.model;
|
final model = state.lockSetInfoData.value.lockBasicInfo?.model;
|
||||||
|
|
||||||
final PassthroughListResponse entity = await ApiRepository.to.getPassthroughList(data: {
|
final PassthroughListResponse entity =
|
||||||
|
await ApiRepository.to.getPassthroughList(data: {
|
||||||
'vendor': vendor!,
|
'vendor': vendor!,
|
||||||
'model': model!,
|
'model': model!,
|
||||||
});
|
});
|
||||||
@ -108,15 +110,18 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
final passthroughItem = PassthroughItem(
|
final passthroughItem = PassthroughItem(
|
||||||
lang: element.lang,
|
lang: element.lang,
|
||||||
timbres: element.timbres,
|
timbres: element.timbres,
|
||||||
langText: ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle,
|
langText:
|
||||||
|
ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle,
|
||||||
name: element.name,
|
name: element.name,
|
||||||
);
|
);
|
||||||
state.languages.add(passthroughItem);
|
state.languages.add(passthroughItem);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
state.languages.refresh();
|
state.languages.refresh();
|
||||||
final lang = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang;
|
final lang = state
|
||||||
final timbre = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre;
|
.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang;
|
||||||
|
final timbre = state
|
||||||
|
.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre;
|
||||||
// 传统 for 循环，直接通过索引访问
|
// 传统 for 循环，直接通过索引访问
|
||||||
for (int i = 0; i < state.languages.length; i++) {
|
for (int i = 0; i < state.languages.length; i++) {
|
||||||
final language = state.languages[i]; // 当前元素
|
final language = state.languages[i]; // 当前元素
|
||||||
@ -151,7 +156,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
// APP层的语言
|
// APP层的语言
|
||||||
Locale? currentLocale = Get.locale; // 直接获取最新语言
|
Locale? currentLocale = Get.locale; // 直接获取最新语言
|
||||||
if (currentLocale != null) {
|
if (currentLocale != null) {
|
||||||
final indexWhere = state.languages.indexWhere((element) => element.lang == currentLocale.toString());
|
final indexWhere = state.languages
|
||||||
|
.indexWhere((element) => element.lang == currentLocale.toString());
|
||||||
state.selectPassthroughListIndex.value = indexWhere;
|
state.selectPassthroughListIndex.value = indexWhere;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -186,11 +192,15 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
showBlueConnetctToastTimer(action: () {
|
showBlueConnetctToastTimer(action: () {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
});
|
});
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName,
|
||||||
|
(BluetoothConnectionState deviceConnectionState) async {
|
||||||
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
||||||
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
final List<String>? privateKey =
|
||||||
final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
|
await Storage.getStringList(saveBluePrivateKey);
|
||||||
final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
|
final List<int> getPrivateKeyList =
|
||||||
|
changeStringListToIntList(privateKey!);
|
||||||
|
final List<String>? signKey =
|
||||||
|
await Storage.getStringList(saveBlueSignKey);
|
||||||
final List<int> signKeyDataList = changeStringListToIntList(signKey!);
|
final List<int> signKeyDataList = changeStringListToIntList(signKey!);
|
||||||
final String uid = await Storage.getUid() ?? '';
|
final String uid = await Storage.getUid() ?? '';
|
||||||
final String md5Str = md5.convert(data).toString().toUpperCase();
|
final String md5Str = md5.convert(data).toString().toUpperCase();
|
||||||
@ -209,7 +219,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
privateKey: getPrivateKeyList)
|
privateKey: getPrivateKeyList)
|
||||||
.packageData(),
|
.packageData(),
|
||||||
);
|
);
|
||||||
} else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
|
} else if (deviceConnectionState ==
|
||||||
|
BluetoothConnectionState.disconnected) {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
cancelBlueConnetctToastTimer();
|
cancelBlueConnetctToastTimer();
|
||||||
}
|
}
|
||||||
@ -222,14 +233,16 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
showBlueConnetctToastTimer(action: () {
|
showBlueConnetctToastTimer(action: () {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
});
|
});
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName,
|
||||||
|
(BluetoothConnectionState deviceConnectionState) async {
|
||||||
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
||||||
BlueManage().writeCharacteristicWithResponse(
|
BlueManage().writeCharacteristicWithResponse(
|
||||||
GetDeviceModelCommand(
|
GetDeviceModelCommand(
|
||||||
lockID: BlueManage().connectDeviceName,
|
lockID: BlueManage().connectDeviceName,
|
||||||
).packageData(),
|
).packageData(),
|
||||||
);
|
);
|
||||||
} else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
|
} else if (deviceConnectionState ==
|
||||||
|
BluetoothConnectionState.disconnected) {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
cancelBlueConnetctToastTimer();
|
cancelBlueConnetctToastTimer();
|
||||||
showBlueConnetctToast();
|
showBlueConnetctToast();
|
||||||
@ -238,7 +251,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 开始配置语音包
|
// 开始配置语音包
|
||||||
void _handlerStartVoicePackageConfigure(VoicePackageConfigureReply reply) async {
|
void _handlerStartVoicePackageConfigure(
|
||||||
|
VoicePackageConfigureReply reply) async {
|
||||||
final int status = reply.data[6];
|
final int status = reply.data[6];
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case 0x00:
|
case 0x00:
|
||||||
@ -266,7 +280,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
if (state.data == null) return;
|
if (state.data == null) return;
|
||||||
state.voiceSubcontractingIndex = 0;
|
state.voiceSubcontractingIndex = 0;
|
||||||
state.voiceSubcontractingCount =
|
state.voiceSubcontractingCount =
|
||||||
(state.data!.length + state.voiceSubcontractingSize - 1) ~/ state.voiceSubcontractingSize;
|
(state.data!.length + state.voiceSubcontractingSize - 1) ~/
|
||||||
|
state.voiceSubcontractingSize;
|
||||||
state.progress.value = 0.0; // 开始前重置进度
|
state.progress.value = 0.0; // 开始前重置进度
|
||||||
_sendNextPackage();
|
_sendNextPackage();
|
||||||
}
|
}
|
||||||
@ -317,7 +332,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
Uint8List packageData = state.data!.sublist(start, end);
|
Uint8List packageData = state.data!.sublist(start, end);
|
||||||
|
|
||||||
// 更新分包进度
|
// 更新分包进度
|
||||||
state.progress.value = (state.voiceSubcontractingIndex + 1) / state.voiceSubcontractingCount;
|
state.progress.value =
|
||||||
|
(state.voiceSubcontractingIndex + 1) / state.voiceSubcontractingCount;
|
||||||
EasyLoading.showProgress(state.progress.value,
|
EasyLoading.showProgress(state.progress.value,
|
||||||
status: '正在发送数据 ${(state.progress.value * 100).toStringAsFixed(0)}%');
|
status: '正在发送数据 ${(state.progress.value * 100).toStringAsFixed(0)}%');
|
||||||
await _sendLanguageFileBleMessage(
|
await _sendLanguageFileBleMessage(
|
||||||
@ -326,7 +342,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
_sendLanguageFileBleMessage({required int index, required Uint8List data}) async {
|
_sendLanguageFileBleMessage(
|
||||||
|
{required int index, required Uint8List data}) async {
|
||||||
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
||||||
(BluetoothConnectionState deviceConnectionState) async {
|
(BluetoothConnectionState deviceConnectionState) async {
|
||||||
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
||||||
@ -337,15 +354,17 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
data: data,
|
data: data,
|
||||||
).packageData(),
|
).packageData(),
|
||||||
);
|
);
|
||||||
} else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
|
} else if (deviceConnectionState ==
|
||||||
|
BluetoothConnectionState.disconnected) {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
cancelBlueConnetctToastTimer();
|
cancelBlueConnetctToastTimer();
|
||||||
// showBlueConnetctToast();
|
showBlueConnetctToast();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void _handlerVoicePackageConfigureProcess(VoicePackageConfigureProcessReply reply) {
|
void _handlerVoicePackageConfigureProcess(
|
||||||
|
VoicePackageConfigureProcessReply reply) {
|
||||||
// 取消超时定时器（已收到回复，无需继续等待）
|
// 取消超时定时器（已收到回复，无需继续等待）
|
||||||
_sendTimeoutTimer?.cancel();
|
_sendTimeoutTimer?.cancel();
|
||||||
_isTimeout = false; // 重置超时标志
|
_isTimeout = false; // 重置超时标志
|
||||||
@ -412,7 +431,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _executeLogic(VoicePackageConfigureConfirmationReply reply) async {
|
Future<void> _executeLogic(
|
||||||
|
VoicePackageConfigureConfirmationReply reply) async {
|
||||||
await _handlerVoicePackageConfigureConfirmation(reply);
|
await _handlerVoicePackageConfigureConfirmation(reply);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -420,12 +440,9 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
VoicePackageConfigureConfirmationReply reply,
|
VoicePackageConfigureConfirmationReply reply,
|
||||||
) async {
|
) async {
|
||||||
showEasyLoading();
|
showEasyLoading();
|
||||||
showBlueConnetctToastTimer(
|
showBlueConnetctToastTimer(action: () {
|
||||||
action: () {
|
dismissEasyLoading();
|
||||||
dismissEasyLoading();
|
});
|
||||||
},
|
|
||||||
isShowBlueConnetctToast: false,
|
|
||||||
);
|
|
||||||
final LoginEntity entity = await ApiRepository.to.settingCurrentVoiceTimbre(
|
final LoginEntity entity = await ApiRepository.to.settingCurrentVoiceTimbre(
|
||||||
data: {
|
data: {
|
||||||
'lang': state.tempLangStr.value,
|
'lang': state.tempLangStr.value,
|
||||||
@ -435,8 +452,10 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
);
|
);
|
||||||
if (entity.errorCode!.codeIsSuccessful) {
|
if (entity.errorCode!.codeIsSuccessful) {
|
||||||
showSuccess('设置成功'.tr, something: () async {
|
showSuccess('设置成功'.tr, something: () async {
|
||||||
state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang = state.tempLangStr.value;
|
state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang =
|
||||||
state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre = state.tempTimbreStr.value;
|
state.tempLangStr.value;
|
||||||
|
state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre
|
||||||
|
?.timbre = state.tempTimbreStr.value;
|
||||||
|
|
||||||
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
||||||
(BluetoothConnectionState deviceConnectionState) async {
|
(BluetoothConnectionState deviceConnectionState) async {
|
||||||
@ -447,10 +466,11 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
languageCode: state.tempLangStr.value,
|
languageCode: state.tempLangStr.value,
|
||||||
).packageData(),
|
).packageData(),
|
||||||
);
|
);
|
||||||
} else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
|
} else if (deviceConnectionState ==
|
||||||
|
BluetoothConnectionState.disconnected) {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
cancelBlueConnetctToastTimer();
|
cancelBlueConnetctToastTimer();
|
||||||
// showBlueConnetctToast();
|
showBlueConnetctToast();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
await Future.delayed(Duration(seconds: 1));
|
await Future.delayed(Duration(seconds: 1));
|
||||||
@ -471,7 +491,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void handleLockCurrentVoicePacketResult(ReadLockCurrentVoicePacketReply reply) {
|
void handleLockCurrentVoicePacketResult(
|
||||||
|
ReadLockCurrentVoicePacketReply reply) {
|
||||||
final int status = reply.data[2];
|
final int status = reply.data[2];
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case 0x00:
|
case 0x00:
|
||||||
@ -480,21 +501,25 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
|
|
||||||
const int languageCodeStartIndex = 3;
|
const int languageCodeStartIndex = 3;
|
||||||
const int languageCodeLength = 20;
|
const int languageCodeLength = 20;
|
||||||
const int languageCodeEndIndex = languageCodeStartIndex + languageCodeLength; // 23
|
const int languageCodeEndIndex =
|
||||||
|
languageCodeStartIndex + languageCodeLength; // 23
|
||||||
|
|
||||||
if (reply.data.length < languageCodeEndIndex) {
|
if (reply.data.length < languageCodeEndIndex) {
|
||||||
throw Exception(
|
throw Exception(
|
||||||
'Reply data is too short to contain LanguageCode. Expected at least $languageCodeEndIndex bytes, got ${reply.data.length}');
|
'Reply data is too short to contain LanguageCode. Expected at least $languageCodeEndIndex bytes, got ${reply.data.length}');
|
||||||
}
|
}
|
||||||
List<int> languageCodeBytes = reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex);
|
List<int> languageCodeBytes =
|
||||||
|
reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex);
|
||||||
|
|
||||||
String languageCode = String.fromCharCodes(languageCodeBytes);
|
String languageCode = String.fromCharCodes(languageCodeBytes);
|
||||||
|
|
||||||
languageCode = languageCode.trim(); // 移除首尾空格
|
languageCode = languageCode.trim(); // 移除首尾空格
|
||||||
languageCode = languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)
|
languageCode =
|
||||||
|
languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)
|
||||||
|
|
||||||
if (languageCode != null && languageCode != '') {
|
if (languageCode != null && languageCode != '') {
|
||||||
final indexWhere = state.languages.indexWhere((element) => element.lang == languageCode);
|
final indexWhere = state.languages
|
||||||
|
.indexWhere((element) => element.lang == languageCode);
|
||||||
if (indexWhere != -1) {
|
if (indexWhere != -1) {
|
||||||
print('锁板上的语言是:$languageCode,下标是:$indexWhere');
|
print('锁板上的语言是:$languageCode,下标是:$indexWhere');
|
||||||
state.selectPassthroughListIndex.value = indexWhere;
|
state.selectPassthroughListIndex.value = indexWhere;
|
||||||
@ -516,11 +541,9 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
|
|
||||||
void readLockLanguage() async {
|
void readLockLanguage() async {
|
||||||
showEasyLoading();
|
showEasyLoading();
|
||||||
showBlueConnetctToastTimer(
|
showBlueConnetctToastTimer(action: () {
|
||||||
isShowBlueConnetctToast: false,
|
dismissEasyLoading();
|
||||||
action: () {
|
});
|
||||||
dismissEasyLoading();
|
|
||||||
});
|
|
||||||
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
||||||
(BluetoothConnectionState deviceConnectionState) async {
|
(BluetoothConnectionState deviceConnectionState) async {
|
||||||
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
||||||
@ -529,10 +552,11 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
|
|||||||
lockID: BlueManage().connectDeviceName,
|
lockID: BlueManage().connectDeviceName,
|
||||||
).packageData(),
|
).packageData(),
|
||||||
);
|
);
|
||||||
} else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
|
} else if (deviceConnectionState ==
|
||||||
|
BluetoothConnectionState.disconnected) {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
cancelBlueConnetctToastTimer();
|
cancelBlueConnetctToastTimer();
|
||||||
// showBlueConnetctToast();
|
showBlueConnetctToast();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -43,7 +43,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
@override
|
@override
|
||||||
void onInit() async {
|
void onInit() async {
|
||||||
super.onInit();
|
super.onInit();
|
||||||
_replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
|
_replySubscription =
|
||||||
|
EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
|
||||||
if (reply is VoicePackageConfigureReply) {
|
if (reply is VoicePackageConfigureReply) {
|
||||||
// 语言包配置开始
|
// 语言包配置开始
|
||||||
_handlerStartVoicePackageConfigure(reply);
|
_handlerStartVoicePackageConfigure(reply);
|
||||||
@ -77,14 +78,12 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _executeLogic(VoicePackageConfigureConfirmationReply reply) async {
|
Future<void> _executeLogic(
|
||||||
|
VoicePackageConfigureConfirmationReply reply) async {
|
||||||
showEasyLoading();
|
showEasyLoading();
|
||||||
showBlueConnetctToastTimer(
|
showBlueConnetctToastTimer(action: () {
|
||||||
action: () {
|
dismissEasyLoading();
|
||||||
dismissEasyLoading();
|
});
|
||||||
},
|
|
||||||
isShowBlueConnetctToast: false,
|
|
||||||
);
|
|
||||||
final LoginEntity entity = await ApiRepository.to.settingCurrentVoiceTimbre(
|
final LoginEntity entity = await ApiRepository.to.settingCurrentVoiceTimbre(
|
||||||
data: {
|
data: {
|
||||||
'lang': state.tempLangStr.value,
|
'lang': state.tempLangStr.value,
|
||||||
@ -94,8 +93,10 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
);
|
);
|
||||||
if (entity.errorCode!.codeIsSuccessful) {
|
if (entity.errorCode!.codeIsSuccessful) {
|
||||||
showSuccess('设置成功'.tr, something: () async {
|
showSuccess('设置成功'.tr, something: () async {
|
||||||
state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang = state.tempLangStr.value;
|
state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang =
|
||||||
state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre = state.tempTimbreStr.value;
|
state.tempLangStr.value;
|
||||||
|
state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre
|
||||||
|
?.timbre = state.tempTimbreStr.value;
|
||||||
|
|
||||||
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
||||||
(BluetoothConnectionState deviceConnectionState) async {
|
(BluetoothConnectionState deviceConnectionState) async {
|
||||||
@ -106,14 +107,16 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
languageCode: state.tempLangStr.value,
|
languageCode: state.tempLangStr.value,
|
||||||
).packageData(),
|
).packageData(),
|
||||||
);
|
);
|
||||||
} else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
|
} else if (deviceConnectionState ==
|
||||||
|
BluetoothConnectionState.disconnected) {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
cancelBlueConnetctToastTimer();
|
cancelBlueConnetctToastTimer();
|
||||||
// showBlueConnetctToast();
|
showBlueConnetctToast();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
await Future.delayed(Duration(seconds: 1));
|
await Future.delayed(Duration(seconds: 1));
|
||||||
eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
|
eventBus
|
||||||
|
.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
|
||||||
Get.offAllNamed(Routers.starLockMain);
|
Get.offAllNamed(Routers.starLockMain);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -142,7 +145,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
// APP层的语言
|
// APP层的语言
|
||||||
Locale? currentLocale = Get.locale; // 直接获取最新语言
|
Locale? currentLocale = Get.locale; // 直接获取最新语言
|
||||||
if (currentLocale != null) {
|
if (currentLocale != null) {
|
||||||
final indexWhere = state.languages.indexWhere((element) => element.lang == currentLocale.toString());
|
final indexWhere = state.languages
|
||||||
|
.indexWhere((element) => element.lang == currentLocale.toString());
|
||||||
state.selectPassthroughListIndex.value = indexWhere;
|
state.selectPassthroughListIndex.value = indexWhere;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -172,11 +176,15 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
showBlueConnetctToastTimer(action: () {
|
showBlueConnetctToastTimer(action: () {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
});
|
});
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName,
|
||||||
|
(BluetoothConnectionState deviceConnectionState) async {
|
||||||
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
||||||
final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
|
final List<String>? privateKey =
|
||||||
final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
|
await Storage.getStringList(saveBluePrivateKey);
|
||||||
final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
|
final List<int> getPrivateKeyList =
|
||||||
|
changeStringListToIntList(privateKey!);
|
||||||
|
final List<String>? signKey =
|
||||||
|
await Storage.getStringList(saveBlueSignKey);
|
||||||
final List<int> signKeyDataList = changeStringListToIntList(signKey!);
|
final List<int> signKeyDataList = changeStringListToIntList(signKey!);
|
||||||
final String uid = await Storage.getUid() ?? '';
|
final String uid = await Storage.getUid() ?? '';
|
||||||
final String md5Str = md5.convert(data).toString().toUpperCase();
|
final String md5Str = md5.convert(data).toString().toUpperCase();
|
||||||
@ -195,7 +203,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
privateKey: getPrivateKeyList)
|
privateKey: getPrivateKeyList)
|
||||||
.packageData(),
|
.packageData(),
|
||||||
);
|
);
|
||||||
} else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
|
} else if (deviceConnectionState ==
|
||||||
|
BluetoothConnectionState.disconnected) {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
cancelBlueConnetctToastTimer();
|
cancelBlueConnetctToastTimer();
|
||||||
|
|
||||||
@ -207,7 +216,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void _handlerVoicePackageConfigureProcess(VoicePackageConfigureProcessReply reply) {
|
void _handlerVoicePackageConfigureProcess(
|
||||||
|
VoicePackageConfigureProcessReply reply) {
|
||||||
// 取消超时定时器（已收到回复，无需继续等待）
|
// 取消超时定时器（已收到回复，无需继续等待）
|
||||||
_sendTimeoutTimer?.cancel();
|
_sendTimeoutTimer?.cancel();
|
||||||
_isTimeout = false; // 重置超时标志
|
_isTimeout = false; // 重置超时标志
|
||||||
@ -225,7 +235,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 开始配置语音包
|
// 开始配置语音包
|
||||||
void _handlerStartVoicePackageConfigure(VoicePackageConfigureReply reply) async {
|
void _handlerStartVoicePackageConfigure(
|
||||||
|
VoicePackageConfigureReply reply) async {
|
||||||
final int status = reply.data[6];
|
final int status = reply.data[6];
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case 0x00:
|
case 0x00:
|
||||||
@ -254,7 +265,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
final vendor = state.lockSetInfoData.value.lockBasicInfo?.vendor;
|
final vendor = state.lockSetInfoData.value.lockBasicInfo?.vendor;
|
||||||
final model = state.lockSetInfoData.value.lockBasicInfo?.model;
|
final model = state.lockSetInfoData.value.lockBasicInfo?.model;
|
||||||
|
|
||||||
final PassthroughListResponse entity = await ApiRepository.to.getPassthroughList(data: {
|
final PassthroughListResponse entity =
|
||||||
|
await ApiRepository.to.getPassthroughList(data: {
|
||||||
'vendor': vendor!,
|
'vendor': vendor!,
|
||||||
'model': model!,
|
'model': model!,
|
||||||
});
|
});
|
||||||
@ -290,7 +302,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
final passthroughItem = PassthroughItem(
|
final passthroughItem = PassthroughItem(
|
||||||
lang: element.lang,
|
lang: element.lang,
|
||||||
timbres: element.timbres,
|
timbres: element.timbres,
|
||||||
langText: ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle,
|
langText:
|
||||||
|
ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle,
|
||||||
name: element.name,
|
name: element.name,
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -298,8 +311,10 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
state.languages.refresh();
|
state.languages.refresh();
|
||||||
final lang = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang;
|
final lang = state
|
||||||
final timbre = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre;
|
.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang;
|
||||||
|
final timbre = state
|
||||||
|
.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre;
|
||||||
state.languages.value.forEach((element) {
|
state.languages.value.forEach((element) {
|
||||||
final timbres = element.timbres;
|
final timbres = element.timbres;
|
||||||
timbres.forEach((item) {
|
timbres.forEach((item) {
|
||||||
@ -320,7 +335,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
if (state.data == null) return;
|
if (state.data == null) return;
|
||||||
state.voiceSubcontractingIndex = 0;
|
state.voiceSubcontractingIndex = 0;
|
||||||
state.voiceSubcontractingCount =
|
state.voiceSubcontractingCount =
|
||||||
(state.data!.length + state.voiceSubcontractingSize - 1) ~/ state.voiceSubcontractingSize;
|
(state.data!.length + state.voiceSubcontractingSize - 1) ~/
|
||||||
|
state.voiceSubcontractingSize;
|
||||||
state.progress.value = 0.0; // 开始前重置进度
|
state.progress.value = 0.0; // 开始前重置进度
|
||||||
_sendNextPackage();
|
_sendNextPackage();
|
||||||
}
|
}
|
||||||
@ -364,7 +380,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
Uint8List packageData = state.data!.sublist(start, end);
|
Uint8List packageData = state.data!.sublist(start, end);
|
||||||
|
|
||||||
// 更新分包进度
|
// 更新分包进度
|
||||||
state.progress.value = (state.voiceSubcontractingIndex + 1) / state.voiceSubcontractingCount;
|
state.progress.value =
|
||||||
|
(state.voiceSubcontractingIndex + 1) / state.voiceSubcontractingCount;
|
||||||
EasyLoading.showProgress(state.progress.value,
|
EasyLoading.showProgress(state.progress.value,
|
||||||
status: '正在发送数据 ${(state.progress.value * 100).toStringAsFixed(0)}%');
|
status: '正在发送数据 ${(state.progress.value * 100).toStringAsFixed(0)}%');
|
||||||
_sendLanguageFileBleMessage(
|
_sendLanguageFileBleMessage(
|
||||||
@ -374,7 +391,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_sendLanguageFileBleMessage({required int index, required Uint8List data}) {
|
_sendLanguageFileBleMessage({required int index, required Uint8List data}) {
|
||||||
BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
|
BlueManage().blueSendData(BlueManage().connectDeviceName,
|
||||||
|
(BluetoothConnectionState deviceConnectionState) async {
|
||||||
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
||||||
BlueManage().writeCharacteristicWithResponse(
|
BlueManage().writeCharacteristicWithResponse(
|
||||||
VoicePackageConfigureProcess(
|
VoicePackageConfigureProcess(
|
||||||
@ -383,7 +401,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
data: data,
|
data: data,
|
||||||
).packageData(),
|
).packageData(),
|
||||||
);
|
);
|
||||||
} else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
|
} else if (deviceConnectionState ==
|
||||||
|
BluetoothConnectionState.disconnected) {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
cancelBlueConnetctToastTimer();
|
cancelBlueConnetctToastTimer();
|
||||||
// showBlueConnetctToast();
|
// showBlueConnetctToast();
|
||||||
@ -426,12 +445,9 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
|
|
||||||
void readLockLanguage() async {
|
void readLockLanguage() async {
|
||||||
showEasyLoading();
|
showEasyLoading();
|
||||||
showBlueConnetctToastTimer(
|
showBlueConnetctToastTimer(action: () {
|
||||||
action: () {
|
dismissEasyLoading();
|
||||||
dismissEasyLoading();
|
});
|
||||||
},
|
|
||||||
isShowBlueConnetctToast: false,
|
|
||||||
);
|
|
||||||
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
await BlueManage().blueSendData(BlueManage().connectDeviceName,
|
||||||
(BluetoothConnectionState deviceConnectionState) async {
|
(BluetoothConnectionState deviceConnectionState) async {
|
||||||
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
if (deviceConnectionState == BluetoothConnectionState.connected) {
|
||||||
@ -440,15 +456,17 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
lockID: BlueManage().connectDeviceName,
|
lockID: BlueManage().connectDeviceName,
|
||||||
).packageData(),
|
).packageData(),
|
||||||
);
|
);
|
||||||
} else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
|
} else if (deviceConnectionState ==
|
||||||
|
BluetoothConnectionState.disconnected) {
|
||||||
dismissEasyLoading();
|
dismissEasyLoading();
|
||||||
cancelBlueConnetctToastTimer();
|
cancelBlueConnetctToastTimer();
|
||||||
// showBlueConnetctToast();
|
showBlueConnetctToast();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void handleLockCurrentVoicePacketResult(ReadLockCurrentVoicePacketReply reply) {
|
void handleLockCurrentVoicePacketResult(
|
||||||
|
ReadLockCurrentVoicePacketReply reply) {
|
||||||
final int status = reply.data[2];
|
final int status = reply.data[2];
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case 0x00:
|
case 0x00:
|
||||||
@ -457,24 +475,28 @@ class LockVoiceSettingLogic extends BaseGetXController {
|
|||||||
|
|
||||||
const int languageCodeStartIndex = 3;
|
const int languageCodeStartIndex = 3;
|
||||||
const int languageCodeLength = 20;
|
const int languageCodeLength = 20;
|
||||||
const int languageCodeEndIndex = languageCodeStartIndex + languageCodeLength; // 23
|
const int languageCodeEndIndex =
|
||||||
|
languageCodeStartIndex + languageCodeLength; // 23
|
||||||
|
|
||||||
if (reply.data.length < languageCodeEndIndex) {
|
if (reply.data.length < languageCodeEndIndex) {
|
||||||
throw Exception(
|
throw Exception(
|
||||||
'Reply data is too short to contain LanguageCode. Expected at least $languageCodeEndIndex bytes, got ${reply.data.length}');
|
'Reply data is too short to contain LanguageCode. Expected at least $languageCodeEndIndex bytes, got ${reply.data.length}');
|
||||||
}
|
}
|
||||||
|
|
||||||
List<int> languageCodeBytes = reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex);
|
List<int> languageCodeBytes =
|
||||||
|
reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex);
|
||||||
|
|
||||||
String languageCode = String.fromCharCodes(languageCodeBytes);
|
String languageCode = String.fromCharCodes(languageCodeBytes);
|
||||||
|
|
||||||
languageCode = languageCode.trim(); // 移除首尾空格
|
languageCode = languageCode.trim(); // 移除首尾空格
|
||||||
languageCode = languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)
|
languageCode =
|
||||||
|
languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)
|
||||||
|
|
||||||
print('LanguageCode: $languageCode'); // 例如: zh_CN, en_US
|
print('LanguageCode: $languageCode'); // 例如: zh_CN, en_US
|
||||||
|
|
||||||
if (languageCode != null && languageCode != '') {
|
if (languageCode != null && languageCode != '') {
|
||||||
final indexWhere = state.languages.indexWhere((element) => element.lang == languageCode);
|
final indexWhere = state.languages
|
||||||
|
.indexWhere((element) => element.lang == languageCode);
|
||||||
if (indexWhere != -1) {
|
if (indexWhere != -1) {
|
||||||
print('锁板上的语言是:$languageCode,下标是:$indexWhere');
|
print('锁板上的语言是:$languageCode,下标是:$indexWhere');
|
||||||
state.selectPassthroughListIndex.value = indexWhere;
|
state.selectPassthroughListIndex.value = indexWhere;
|
||||||
|
|||||||
1775
pubspec.lock
Normal file
1775
pubspec.lock
Normal file
File diff suppressed because it is too large
Load Diff
11
pubspec.yaml
11
pubspec.yaml
@ -176,12 +176,12 @@ dependencies:
|
|||||||
url_launcher: ^6.1.10
|
url_launcher: ^6.1.10
|
||||||
#蓝牙
|
#蓝牙
|
||||||
# flutter_reactive_ble: ^5.1.1
|
# flutter_reactive_ble: ^5.1.1
|
||||||
flutter_blue_plus: 1.33.0
|
flutter_blue_plus: 1.32.7
|
||||||
#
|
#
|
||||||
event_bus: ^2.0.0
|
event_bus: ^2.0.0
|
||||||
#菊花
|
#菊花
|
||||||
flutter_easyloading: 3.0.5
|
flutter_easyloading: 3.0.4
|
||||||
flutter_spinkit: 5.2.1
|
|
||||||
#图形验证码
|
#图形验证码
|
||||||
# aj_captcha_flutter: ^0.0.1
|
# aj_captcha_flutter: ^0.0.1
|
||||||
asn1lib: ^1.6.5
|
asn1lib: ^1.6.5
|
||||||
@ -218,7 +218,7 @@ dependencies:
|
|||||||
|
|
||||||
jpush_flutter:
|
jpush_flutter:
|
||||||
git:
|
git:
|
||||||
url: git@code.star-lock.cn:StarlockTeam/jpush_flutter.git
|
url: git@code-internal.star-lock.cn:StarlockTeam/jpush_flutter.git
|
||||||
ref: 656df9ee91b1ec8b96aa1208a6b0df27a4516067
|
ref: 656df9ee91b1ec8b96aa1208a6b0df27a4516067
|
||||||
|
|
||||||
#视频播放器
|
#视频播放器
|
||||||
@ -235,7 +235,6 @@ dependencies:
|
|||||||
# ffmpeg_kit_flutter: 5.1.0-LTS
|
# ffmpeg_kit_flutter: 5.1.0-LTS
|
||||||
fast_gbk: ^1.0.0
|
fast_gbk: ^1.0.0
|
||||||
flutter_pcm_sound: ^1.1.0
|
flutter_pcm_sound: ^1.1.0
|
||||||
|
|
||||||
intl: ^0.18.0
|
intl: ^0.18.0
|
||||||
# flutter_audio_capture: <1.1.5
|
# flutter_audio_capture: <1.1.5
|
||||||
|
|
||||||
@ -247,7 +246,7 @@ dependencies:
|
|||||||
#侧滑删除
|
#侧滑删除
|
||||||
flutter_slidable: ^3.0.1
|
flutter_slidable: ^3.0.1
|
||||||
# audio_service: ^0.18.12
|
# audio_service: ^0.18.12
|
||||||
app_settings: ^6.1.1
|
app_settings: ^5.1.1
|
||||||
flutter_local_notifications: ^17.0.0
|
flutter_local_notifications: ^17.0.0
|
||||||
fluwx: 4.5.5
|
fluwx: 4.5.5
|
||||||
system_settings: ^2.0.0
|
system_settings: ^2.0.0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user