diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml new file mode 100644 index 00000000..ed74d7a5 --- /dev/null +++ b/.gitea/workflows/ci.yml @@ -0,0 +1,234 @@ +name: Flutter CI - Basic Setup + +on: + push: + branches: + - master_sky + pull_request: + branches: + - master_sky + +jobs: + # 基础设置任务：检出代码、提取版本号 + basic-setup: + name: 🔧 Basic Setup + runs-on: sky + steps: + # 1. 检出代码 + - name: Checkout Code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + # 2. 提取版本号 + - name: Extract Version + id: version + run: | + # 获取最新的tag（按版本号排序，匹配vX.X.X_sky格式） + LATEST_TAG=$(git tag --list "v*.*.*_sky" --sort=-version:refname | head -1) + + # 如果没有找到tag，使用默认值 + if [ -z "$LATEST_TAG" ]; then + LATEST_TAG="v1.0.0_sky" + echo "📌 No tags found, using default: $LATEST_TAG" + else + echo "📌 Latest tag found: $LATEST_TAG" + fi + + # 提取基础版本号（去除_sky后缀） + BASE_VERSION=$(echo "$LATEST_TAG" | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | head -1) + [ -z "$BASE_VERSION" ] && BASE_VERSION="v1.0.0" + echo "📌 Base version: $BASE_VERSION" + + # 解析版本号各部分 + MAJOR=$(echo $BASE_VERSION | cut -d'.' -f1 | sed 's/v//') + MINOR=$(echo $BASE_VERSION | cut -d'.' -f2) + PATCH=$(echo $BASE_VERSION | cut -d'.' -f3) + echo "📌 Version components: Major=$MAJOR, Minor=$MINOR, Patch=$PATCH" + + # 计算下一个版本号 + echo "📊 Calculating next version..." + + # 获取当前提交与最新tag之间的所有提交消息 + COMMIT_MESSAGES=$(git log --oneline --format=%s $LATEST_TAG..HEAD 2>/dev/null || echo "") + + # 统计需要递增的提交次数（过滤重复的提交消息） + INCREMENT_COUNT=0 + if [ -n "$COMMIT_MESSAGES" ]; then + # 使用awk过滤重复的提交消息并计数 + UNIQUE_MESSAGES=$(echo "$COMMIT_MESSAGES" | awk '!seen[$0]++') + INCREMENT_COUNT=$(echo "$UNIQUE_MESSAGES" | wc -l) + echo "📝 Found $INCREMENT_COUNT unique commit(s) since last tag" + else + echo "📝 No new commits since last tag" + fi + + # 计算新的版本号 + NEW_PATCH=$((PATCH + INCREMENT_COUNT)) + NEW_MINOR=$MINOR + NEW_MAJOR=$MAJOR + + # 处理版本号进位逻辑 + if [ $NEW_PATCH -ge 1000 ]; then + NEW_MINOR=$((NEW_MINOR + NEW_PATCH / 1000)) + NEW_PATCH=$((NEW_PATCH % 1000)) + echo "🔄 Patch version overflow, incrementing minor version" + fi + + if [ $NEW_MINOR -ge 10 ]; then + NEW_MAJOR=$((NEW_MAJOR + NEW_MINOR / 10)) + NEW_MINOR=$((NEW_MINOR % 10)) + echo "🔄 Minor version overflow, incrementing major version" + fi + + # 生成下一个版本号 + NEXT_VERSION="v${NEW_MAJOR}.${NEW_MINOR}.${NEW_PATCH}" + NEXT_TAG="${NEXT_VERSION}_sky" + + echo "🚀 Next version: $NEXT_VERSION" + echo "🏷️ Next tag: $NEXT_TAG" + echo "📈 Increment count: $INCREMENT_COUNT" + + # 输出到Gitea Actions环境变量 + echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV + echo "NEXT_TAG=$NEXT_TAG" >> $GITHUB_ENV + echo "INCREMENT_COUNT=$INCREMENT_COUNT" >> $GITHUB_ENV + + # 输出版本信息 + echo "✅ Version extraction completed" + # 5. 任务完成通知 + - name: Task Completion + run: | + echo "🎉 Basic CI setup completed successfully!" + echo "" + echo "📋 Tasks executed:" + echo " ✅ Code checkout" + echo " ✅ Version extraction" + echo "" + echo "🚀 Next steps: Building Flutter artifacts..." + + # 构建Flutter制品任务 + build-artifacts: + name: 🏗️ Build Flutter Artifacts + runs-on: sky + needs: basic-setup + steps: + # 1. 检出代码 + - name: Checkout Code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + # 2. 检查Flutter环境 + - name: Check Flutter Environment + run: | + echo "🔍 Checking Flutter environment..." + flutter --version + echo "✅ Flutter environment is ready" + + # 3. 获取版本信息 + - name: Get Version Info + id: version-info + run: | + echo "📊 Using version from basic-setup job" + echo "NEXT_VERSION=${{ env.NEXT_VERSION }}" + echo "NEXT_TAG=${{ env.NEXT_TAG }}" + + # 4. 构建APK文件 + - name: Build APK + run: | + echo "🏗️ Building APK artifact..." + + # 生成当前时间作为build-number（格式：YYYYMMDDHH） + BUILD_NUMBER=$(date +%Y%m%d%H) + echo "📅 Build number: $BUILD_NUMBER" + + # 格式化版本号用于文件名 + VERSION_FOR_FILENAME=$(echo "${{ env.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g') + + # 设置APK文件名 + APK_FILENAME="sky-star-lock-release-$VERSION_FOR_FILENAME.apk" + echo "📁 APK filename: $APK_FILENAME" + + # 构建APK，使用新的构建参数 + flutter build apk --no-tree-shake-icons --release --flavor sky -t lib/main_sky_full.dart --build-number=$BUILD_NUMBER --build-name="sky-star-lock-release-$VERSION_FOR_FILENAME.apk" + + # 重命名APK文件 + mv build/app/outputs/flutter-apk/app-sky-release.apk "$APK_FILENAME" + + echo "✅ APK build completed: $APK_FILENAME" + + # 5. 构建AAB文件 + - name: Build AAB + run: | + echo "🏗️ Building AAB artifact..." + + # 生成当前时间作为build-number（格式：YYYYMMDDHH） + BUILD_NUMBER=$(date +%Y%m%d%H) + echo "📅 Build number: $BUILD_NUMBER" + + # 格式化版本号用于文件名 + VERSION_FOR_FILENAME=$(echo "${{ env.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g') + + # 设置AAB文件名 + AAB_FILENAME="sky-star-lock-release-$VERSION_FOR_FILENAME.aab" + echo "📁 AAB filename: $AAB_FILENAME" + + # 构建AAB，使用新的构建参数 + flutter build appbundle --no-tree-shake-icons --release --flavor sky -t lib/main_sky_full.dart --build-number=$BUILD_NUMBER --build-name="sky-star-lock-release-$VERSION_FOR_FILENAME.aab" + + # 重命名AAB文件 + mv build/app/outputs/bundle/skyRelease/app-sky-release.aab "$AAB_FILENAME" + + echo "✅ AAB build completed: $AAB_FILENAME" + + # 6. 构建iOS IPA文件（如果支持iOS构建） + - name: Build iOS IPA + if: runner.os == 'macos' + run: | + echo "🏗️ Building iOS IPA artifact..." + + # 生成当前时间作为build-number（格式：YYYYMMDDHH） + BUILD_NUMBER=$(date +%Y%m%d%H) + echo "📅 Build number: $BUILD_NUMBER" + + # 格式化版本号用于文件名 + VERSION_FOR_FILENAME=$(echo "${{ env.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g') + + # 设置IPA文件名 + IPA_FILENAME="sky-star-lock-release-$VERSION_FOR_FILENAME.ipa" + echo "📁 IPA filename: $IPA_FILENAME" + + # 构建iOS IPA，使用新的构建参数 + flutter build ipa --no-tree-shake-icons --release --flavor sky -t lib/main_sky_full.dart --build-number=$BUILD_NUMBER --build-name="sky-star-lock-release-$VERSION_FOR_FILENAME.ipa" + + # 重命名IPA文件 + mv build/ios/ipa/*.ipa "$IPA_FILENAME" + + echo "✅ iOS IPA build completed: $IPA_FILENAME" + + # 7. 上传制品 + - name: Upload Artifacts + uses: actions/upload-artifact@v4 + with: + name: flutter-artifacts-release + path: | + sky-star-lock-release-*.apk + sky-star-lock-release-*.aab + sky-star-lock-release-*.ipa + retention-days: 30 + + # 8. 构建完成通知 + - name: Build Completion + run: | + echo "🎉 Flutter artifacts build completed successfully!" + echo "" + echo "📦 Artifacts generated:" + echo " ✅ APK: sky-star-lock-release-*.apk" + echo " ✅ AAB: sky-star-lock-release-*.aab" + if [ "${{ runner.os }}" == "macos" ]; then + echo " ✅ IPA: sky-star-lock-release-*.ipa" + fi + echo "" + echo "🏷️ Version: ${{ env.NEXT_VERSION }}" + echo "📁 Files available in artifacts section" diff --git a/README.md b/README.md index d6ee8c02..8d2bf3ad 100755 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ keytool -list -v -keystore android/app/sky.jks ``` 输入密码（在android/app/build.gradle:38可以看到） - +测试ci 一般需要的是：证书指纹-SHA1 看起来像 95:6B:***********（共59个字符） ## 编译 diff --git a/lan/lan_ar.json b/lan/lan_ar.json index ecf98f2b..ff544bbe 100644 --- a/lan/lan_ar.json +++ b/lan/lan_ar.json @@ -1166,5 +1166,6 @@ "云存会员": "عضوية التخزين السحابي", "服务，图像视频信息随心存！": "معلومات الخدمة والصور والفيديو في قلبك!", "图像": "صورة", - "视频": "فيديو" + "视频": "فيديو", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "حاليا ، لا تدعم الدولة تسجيل رمز التحقق من الهاتف المحمول ، يرجى استخدام عنوان بريدك الإلكتروني للتسجيل" } \ No newline at end of file diff --git a/lan/lan_bg.json b/lan/lan_bg.json index eea05db9..db6513ae 100644 --- a/lan/lan_bg.json +++ b/lan/lan_bg.json @@ -1167,5 +1167,6 @@ "云存会员": "Членство в Cloud Storage", "服务，图像视频信息随心存！": "Информацията за обслужване, изображения и видео са във вашето сърце!", "图像": "изображение", - "视频": "Видео" + "视频": "Видео", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "В момента страната не поддържа регистрация на код за потвърждение на мобилен телефон, моля, използвайте имейл адреса си, за да се регистрирате" } \ No newline at end of file diff --git a/lan/lan_bn.json b/lan/lan_bn.json index 89041a00..6ec6c1d1 100644 --- a/lan/lan_bn.json +++ b/lan/lan_bn.json @@ -1167,5 +1167,6 @@ "云存会员": "ক্লাউড স্টোরেজ সদস্যতা", "服务，图像视频信息随心存！": "পরিষেবা, চিত্র এবং ভিডিও তথ্য আপনার হৃদয়ে!", "图像": "প্রতিচ্ছবি", - "视频": "ভিডিও" + "视频": "ভিডিও", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "বর্তমানে, দেশটি মোবাইল ফোন যাচাইকরণ কোড নিবন্ধন সমর্থন করে না, নিবন্ধন করতে দয়া করে আপনার ইমেল ঠিকানা ব্যবহার করুন" } \ No newline at end of file diff --git a/lan/lan_cs.json b/lan/lan_cs.json index c579af09..a5ddb31f 100644 --- a/lan/lan_cs.json +++ b/lan/lan_cs.json @@ -1167,5 +1167,6 @@ "云存会员": "Členství v cloudovém úložišti", "服务，图像视频信息随心存！": "Servis, obrazové a video informace jsou na prvním místě!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_da.json b/lan/lan_da.json index f5a38024..f9ba754b 100644 --- a/lan/lan_da.json +++ b/lan/lan_da.json @@ -1167,5 +1167,6 @@ "云存会员": "Medlemskab af Cloud Storage", "服务，图像视频信息随心存！": "Service-, billed- og videoinformation er i dit hjerte!", "图像": "billede", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "I øjeblikket understøtter landet ikke registrering af mobiltelefonbekræftelseskode, brug venligst din e-mailadresse til at tilmelde dig" } \ No newline at end of file diff --git a/lan/lan_de.json b/lan/lan_de.json index 1ba029e0..b4068c51 100644 --- a/lan/lan_de.json +++ b/lan/lan_de.json @@ -1167,5 +1167,6 @@ "云存会员": "Cloud-Speicher-Mitgliedschaft", "服务，图像视频信息随心存！": "Service-, Bild- und Videoinformationen liegen Ihnen am Herzen!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_el.json b/lan/lan_el.json index 6e6dafbb..2c4f4739 100644 --- a/lan/lan_el.json +++ b/lan/lan_el.json @@ -1167,5 +1167,6 @@ "云存会员": "Συνδρομή Cloud Storage", "服务，图像视频信息随心存！": "Οι πληροφορίες εξυπηρέτησης, εικόνας και βίντεο είναι στην καρδιά σας!", "图像": "εικόνα", - "视频": "Βίντεο" + "视频": "Βίντεο", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Προς το παρόν, η χώρα δεν υποστηρίζει την εγγραφή κωδικού επαλήθευσης κινητού τηλεφώνου, χρησιμοποιήστε τη διεύθυνση email σας για να εγγραφείτε" } \ No newline at end of file diff --git a/lan/lan_en.json b/lan/lan_en.json index 6d36eb6e..60d149df 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1173,5 +1173,6 @@ "云存会员": "Cloud Storage Membership", "服务，图像视频信息随心存！": "Service, image and video information are at your heart!", "图像": "image", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Currently, the country does not support mobile phone verification code registration, please use your email address to register" } \ No newline at end of file diff --git a/lan/lan_es.json b/lan/lan_es.json index f039a65c..b5a08f60 100644 --- a/lan/lan_es.json +++ b/lan/lan_es.json @@ -1167,5 +1167,6 @@ "云存会员": "Membresía de almacenamiento en la nube", "服务，图像视频信息随心存！": "¡La información de servicio, imagen y video está en su corazón!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_et.json b/lan/lan_et.json index 796dc196..138981f2 100644 --- a/lan/lan_et.json +++ b/lan/lan_et.json @@ -1167,5 +1167,6 @@ "云存会员": "Pilvesalvestuse liikmelisus", "服务，图像视频信息随心存！": "Teenindus-, pildi- ja videoteave on teie südames!", "图像": "Piltide", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Praegu ei toeta riik mobiiltelefoni kinnituskoodi registreerimist, palun kasutage registreerumiseks oma e-posti aadressi" } \ No newline at end of file diff --git a/lan/lan_fi.json b/lan/lan_fi.json index ec701465..35d43d15 100644 --- a/lan/lan_fi.json +++ b/lan/lan_fi.json @@ -1167,5 +1167,6 @@ "云存会员": "Pilvitallennustilan jäsenyys", "服务，图像视频信息随心存！": "Palvelu-, kuva- ja videotiedot ovat sydämessäsi!", "图像": "kuva", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Tällä hetkellä maa ei tue matkapuhelimen vahvistuskoodin rekisteröintiä, käytä rekisteröitymiseen sähköpostiosoitettasi" } \ No newline at end of file diff --git a/lan/lan_fr.json b/lan/lan_fr.json index 530463cd..ead562b4 100644 --- a/lan/lan_fr.json +++ b/lan/lan_fr.json @@ -1167,5 +1167,6 @@ "云存会员": "Adhésion au stockage dans le cloud", "服务，图像视频信息随心存！": "Le service, l’image et les informations vidéo sont au cœur de vos préoccupations !", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_he.json b/lan/lan_he.json index 9969af6e..9e55690f 100644 --- a/lan/lan_he.json +++ b/lan/lan_he.json @@ -1167,5 +1167,6 @@ "云存会员": "חברות באחסון בענן", "服务，图像视频信息随心存！": "מידע על שירות, תמונה ווידאו נמצאים בלב שלך!", "图像": "תמונה", - "视频": "וידאו" + "视频": "וידאו", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "נכון לעכשיו, המדינה אינה תומכת ברישום קוד אימות טלפון נייד, אנא השתמש בכתובת הדוא\"ל שלך כדי להירשם" } \ No newline at end of file diff --git a/lan/lan_hi.json b/lan/lan_hi.json index dd509b23..9ea45150 100644 --- a/lan/lan_hi.json +++ b/lan/lan_hi.json @@ -1167,5 +1167,6 @@ "云存会员": "क्लाउड स्टोरेज सदस्यता", "服务，图像视频信息随心存！": "सेवा, छवि और वीडियो जानकारी आपके दिल में हैं!", "图像": "प्रतिबिंब", - "视频": "वीडियो" + "视频": "वीडियो", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "वर्तमान में, देश मोबाइल फोन सत्यापन कोड पंजीकरण का समर्थन नहीं करता है, कृपया पंजीकरण करने के लिए अपने ईमेल पते का उपयोग करें" } \ No newline at end of file diff --git a/lan/lan_hk.json b/lan/lan_hk.json index 2cac7cfc..d10ac718 100644 --- a/lan/lan_hk.json +++ b/lan/lan_hk.json @@ -1168,5 +1168,6 @@ "云存会员": "雲存會員", "服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！", "图像": "圖像", - "视频": "視頻" + "视频": "視頻", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "當前國家不支援手機驗證碼註冊，請使用郵箱進行註冊" } \ No newline at end of file diff --git a/lan/lan_hr.json b/lan/lan_hr.json index 562619fe..acb1f8cf 100644 --- a/lan/lan_hr.json +++ b/lan/lan_hr.json @@ -1167,5 +1167,6 @@ "云存会员": "Članstvo u pohrani u oblaku", "服务，图像视频信息随心存！": "Informacije o usluzi, slikama i videozapisima su vam u srcu!", "图像": "slika", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Trenutno zemlja ne podržava registraciju koda za provjeru mobilnog telefona, za registraciju koristite svoju adresu e-pošte" } \ No newline at end of file diff --git a/lan/lan_hu.json b/lan/lan_hu.json index 3ee2cb6c..e8269f88 100644 --- a/lan/lan_hu.json +++ b/lan/lan_hu.json @@ -1167,5 +1167,6 @@ "云存会员": "Felhőalapú tárolási tagság", "服务，图像视频信息随心存！": "A szolgáltatás, a képi és videós információk a szívedben vannak!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_hy.json b/lan/lan_hy.json index 0d5973d8..de78b0a0 100644 --- a/lan/lan_hy.json +++ b/lan/lan_hy.json @@ -1173,5 +1173,6 @@ "云存会员": "Cloud Storage Membership", "服务，图像视频信息随心存！": "Ծառայությունը, պատկերը եւ վիդեո տեղեկատվությունը ձեր սրտում են:", "图像": "Պատկերասրահ", - "视频": "Տեսանյութ" + "视频": "Տեսանյութ", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Ներկայումս երկիրը չի աջակցում բջջային հեռախոսի ստուգման կոդի գրանցմանը, խնդրում ենք գրանցվելու համար օգտագործել ձեր էլ. փոստի հասցեն" } \ No newline at end of file diff --git a/lan/lan_id.json b/lan/lan_id.json index 4bda05a3..323f38cc 100644 --- a/lan/lan_id.json +++ b/lan/lan_id.json @@ -1167,5 +1167,6 @@ "云存会员": "Keanggotaan Cloud Storage", "服务，图像视频信息随心存！": "Informasi layanan, gambar, dan video adalah inti Anda!", "图像": "citra", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Saat ini, negara tersebut tidak mendukung pendaftaran kode verifikasi ponsel, silakan gunakan alamat email Anda untuk mendaftar" } \ No newline at end of file diff --git a/lan/lan_it.json b/lan/lan_it.json index 2c5f1032..34142ceb 100644 --- a/lan/lan_it.json +++ b/lan/lan_it.json @@ -1167,5 +1167,6 @@ "云存会员": "Iscrizione al cloud storage", "服务，图像视频信息随心存！": "Le informazioni sul servizio, le immagini e i video sono al tuo centro!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_ja.json b/lan/lan_ja.json index 837f8bfc..6900b8ae 100644 --- a/lan/lan_ja.json +++ b/lan/lan_ja.json @@ -1167,5 +1167,6 @@ "云存会员": "クラウドストレージメンバーシップ", "服务，图像视频信息随心存！": "サービス、画像、ビデオ情報があなたの中心にあります!", "图像": "画像", - "视频": "ビデオ" + "视频": "ビデオ", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "現在、この国は携帯電話の認証コード登録をサポートしていませんので、メールアドレスを使用して登録してください" } \ No newline at end of file diff --git a/lan/lan_ka.json b/lan/lan_ka.json index c33bb677..305621fe 100644 --- a/lan/lan_ka.json +++ b/lan/lan_ka.json @@ -1173,5 +1173,6 @@ "云存会员": "Cloud Storage წევრობა", "服务，图像视频信息随心存！": "მომსახურება, სურათი და ვიდეო ინფორმაცია თქვენს გულშია!", "图像": "სურათი", - "视频": "ვიდეო" + "视频": "ვიდეო", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "ამჟამად, ქვეყანა არ უჭერს მხარს მობილური ტელეფონის დამადასტურებელი კოდის რეგისტრაციას, გთხოვთ გამოიყენოთ თქვენი ელექტრონული ფოსტის მისამართი რეგისტრაციისთვის" } \ No newline at end of file diff --git a/lan/lan_keys.json b/lan/lan_keys.json index 2354d911..c544b82c 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -1178,5 +1178,6 @@ "云存会员": "云存会员", "服务，图像视频信息随心存！": "服务，图像视频信息随心存！", "图像": "图像", - "视频": "视频" + "视频": "视频", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "当前国家不支持手机验证码注册，请使用邮箱进行注册" } diff --git a/lan/lan_kk.json b/lan/lan_kk.json index 17559395..a56d8d3f 100644 --- a/lan/lan_kk.json +++ b/lan/lan_kk.json @@ -1167,5 +1167,6 @@ "云存会员": "Бұлтты сақтауға мүшелік", "服务，图像视频信息随心存！": "Қызмет, бейне және бейне ақпарат сіздің жүрегіңізде жатыр!", "图像": "кескіні", - "视频": "Бейне" + "视频": "Бейне", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Қазіргі уақытта елде ұялы телефонды растау кодын тіркеуді қолдамайды, тіркелу үшін электрондық пошта мекенжайыңызды пайдаланыңыз" } \ No newline at end of file diff --git a/lan/lan_ko.json b/lan/lan_ko.json index 795a95e6..4de6443d 100644 --- a/lan/lan_ko.json +++ b/lan/lan_ko.json @@ -1167,5 +1167,6 @@ "云存会员": "클라우드 스토리지 멤버십", "服务，图像视频信息随心存！": "서비스, 이미지 및 비디오 정보가 당신의 중심에 있습니다!", "图像": "이미지", - "视频": "비디오" + "视频": "비디오", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "현재 해당 국가는 휴대폰 인증코드 등록을 지원하지 않으니 이메일 주소를 사용하여 등록하세요." } \ No newline at end of file diff --git a/lan/lan_lt.json b/lan/lan_lt.json index 01f7613e..abf3dbe1 100644 --- a/lan/lan_lt.json +++ b/lan/lan_lt.json @@ -1167,5 +1167,6 @@ "云存会员": "Debesies saugyklos narystė", "服务，图像视频信息随心存！": "Aptarnavimas, vaizdas ir video informacija yra jūsų širdis!", "图像": "vaizdas", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Šiuo metu šalis nepalaiko mobiliojo telefono patvirtinimo kodo registracijos, registruodamiesi naudokite savo el. pašto adresą" } \ No newline at end of file diff --git a/lan/lan_ms.json b/lan/lan_ms.json index ab4ae836..c5528e7e 100644 --- a/lan/lan_ms.json +++ b/lan/lan_ms.json @@ -1167,5 +1167,6 @@ "云存会员": "Keahlian Storan Awan", "服务，图像视频信息随心存！": "Maklumat perkhidmatan, imej dan video adalah di hati anda!", "图像": "Imej", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Pada masa ini, negara ini tidak menyokong pendaftaran kod pengesahan telefon bimbit, sila gunakan alamat e-mel anda untuk mendaftar" } \ No newline at end of file diff --git a/lan/lan_nl.json b/lan/lan_nl.json index fd04c016..616ca998 100644 --- a/lan/lan_nl.json +++ b/lan/lan_nl.json @@ -1167,5 +1167,6 @@ "云存会员": "Lidmaatschap voor cloudopslag", "服务，图像视频信息随心存！": "Service-, beeld- en video-informatie staan bij u centraal!", "图像": "beeld", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Momenteel ondersteunt het land de registratie van de verificatiecode voor mobiele telefoons niet, gebruik uw e-mailadres om u te registreren" } \ No newline at end of file diff --git a/lan/lan_pl.json b/lan/lan_pl.json index ecf6b824..b790e35a 100644 --- a/lan/lan_pl.json +++ b/lan/lan_pl.json @@ -1167,5 +1167,6 @@ "云存会员": "Członkostwo w usłudze Cloud Storage", "服务，图像视频信息随心存！": "Informacje o serwisie, obrazie i wideo są w Twoim sercu!", "图像": "obraz", - "视频": "Wideo" + "视频": "Wideo", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Obecnie kraj nie obsługuje rejestracji kodem weryfikacyjnym telefonu komórkowego, użyj swojego adresu e-mail, aby się zarejestrować" } \ No newline at end of file diff --git a/lan/lan_pt.json b/lan/lan_pt.json index d2b1aedb..b3a5808f 100644 --- a/lan/lan_pt.json +++ b/lan/lan_pt.json @@ -1167,5 +1167,6 @@ "云存会员": "Associação de armazenamento em nuvem", "服务，图像视频信息随心存！": "Informações de serviço, imagem e vídeo estão no seu coração!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_pt_br.json b/lan/lan_pt_br.json index 32b8e2d2..5c1df9c3 100644 --- a/lan/lan_pt_br.json +++ b/lan/lan_pt_br.json @@ -1172,5 +1172,6 @@ "云存会员": "Associação de armazenamento em nuvem", "服务，图像视频信息随心存！": "Informações de serviço, imagem e vídeo estão no seu coração!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_ro.json b/lan/lan_ro.json index 402a6ee5..645d6afd 100644 --- a/lan/lan_ro.json +++ b/lan/lan_ro.json @@ -1167,5 +1167,6 @@ "云存会员": "Abonament de stocare în cloud", "服务，图像视频信息随心存！": "Serviciile, imaginile și informațiile video sunt în centrul dumneavoastră!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_ru.json b/lan/lan_ru.json index 9bcc4697..954bd1e8 100644 --- a/lan/lan_ru.json +++ b/lan/lan_ru.json @@ -1171,5 +1171,6 @@ "云存会员": "Членство в облачном хранилище", "服务，图像视频信息随心存！": "Сервисная, имиджевая и видеоинформация в Вашем сердце!", "图像": "образ", - "视频": "Видео" + "视频": "Видео", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "В настоящее время страна не поддерживает регистрацию кода верификации мобильного телефона, пожалуйста, используйте свой адрес электронной почты для регистрации" } \ No newline at end of file diff --git a/lan/lan_sk.json b/lan/lan_sk.json index c22f98f2..5183748e 100644 --- a/lan/lan_sk.json +++ b/lan/lan_sk.json @@ -1167,5 +1167,6 @@ "云存会员": "Členstvo v cloudovom úložisku", "服务，图像视频信息随心存！": "Informácie o službách, obrázkoch a videách sú vo vašom srdci!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_sr_cyrl.json b/lan/lan_sr_cyrl.json index 8bcc737c..739c3599 100644 --- a/lan/lan_sr_cyrl.json +++ b/lan/lan_sr_cyrl.json @@ -1167,5 +1167,6 @@ "云存会员": "Чланство у облаку за складиштење", "服务，图像视频信息随心存！": "Сервис , слике и видео информације су у вашем срцу!", "图像": "Слика", - "视频": "Пријава" + "视频": "Пријава", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Тренутно , земља не подржава регистрацију кода за верификацију мобилног телефона, молимо вас да користите своју адресу е-поште за регистрацију" } \ No newline at end of file diff --git a/lan/lan_sv.json b/lan/lan_sv.json index d7615b5d..03d803c2 100644 --- a/lan/lan_sv.json +++ b/lan/lan_sv.json @@ -1167,5 +1167,6 @@ "云存会员": "Medlemskap i molnlagring", "服务，图像视频信息随心存！": "Service, bild- och videoinformation finns i ditt hjärta!", "图像": "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" } \ No newline at end of file diff --git a/lan/lan_th.json b/lan/lan_th.json index 27742fae..5c56bdc4 100644 --- a/lan/lan_th.json +++ b/lan/lan_th.json @@ -1167,5 +1167,6 @@ "云存会员": "สมาชิกที่เก็บข้อมูลบนคลาวด์", "服务，图像视频信息随心存！": "ข้อมูลบริการ รูปภาพ และวิดีโออยู่ที่หัวใจของคุณ!", "图像": "ภาพ", - "视频": "วีดิทัศน์" + "视频": "วีดิทัศน์", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "ปัจจุบันประเทศไม่รองรับการลงทะเบียนรหัสยืนยันโทรศัพท์มือถือ โปรดใช้ที่อยู่อีเมลของคุณในการลงทะเบียน" } \ No newline at end of file diff --git a/lan/lan_tr.json b/lan/lan_tr.json index 282336cf..17af286b 100644 --- a/lan/lan_tr.json +++ b/lan/lan_tr.json @@ -1167,5 +1167,6 @@ "云存会员": "Bulut Depolama Üyeliği", "服务，图像视频信息随心存！": "Servis, görüntü ve video bilgileri kalbinizde!", "图像": "resim", - "视频": "Video" + "视频": "Video", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Şu anda ülke cep telefonu doğrulama kodu kaydını desteklememektedir, lütfen kaydolmak için e-posta adresinizi kullanın" } \ No newline at end of file diff --git a/lan/lan_tw.json b/lan/lan_tw.json index 080e369f..950c49b2 100644 --- a/lan/lan_tw.json +++ b/lan/lan_tw.json @@ -1167,5 +1167,6 @@ "云存会员": "雲存會員", "服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！", "图像": "圖像", - "视频": "視頻" + "视频": "視頻", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "當前國家不支援手機驗證碼註冊，請使用郵箱進行註冊" } \ No newline at end of file diff --git a/lan/lan_uk.json b/lan/lan_uk.json index 1525c36b..b26c8c87 100644 --- a/lan/lan_uk.json +++ b/lan/lan_uk.json @@ -1167,5 +1167,6 @@ "云存会员": "Членство в хмарних сховищах", "服务，图像视频信息随心存！": "Сервіс, зображення та відео інформація у вашому серці!", "图像": "образ", - "视频": "Відео" + "视频": "Відео", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Наразі країна не підтримує реєстрацію коду підтвердження на мобільному телефоні, будь ласка, використовуйте свою адресу електронної пошти для реєстрації" } \ No newline at end of file diff --git a/lan/lan_ur.json b/lan/lan_ur.json index 8869d9ad..c596af6b 100644 --- a/lan/lan_ur.json +++ b/lan/lan_ur.json @@ -1167,5 +1167,6 @@ "云存会员": "Cloud Storage Membership", "服务，图像视频信息随心存！": "خدمت، تصویر اور ویڈیو کی معلومات آپ کے دل میں ہیں!", "图像": "روپ", - "视频": "ویڈیو" + "视频": "ویڈیو", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "فی الحال، ملک موبائل فون کی توثیقی کوڈ رجسٹریشن کی حمایت نہیں کرتا ہے، براہ کرم رجسٹر کرنے کے لئے اپنا ای میل ایڈریس استعمال کریں" } \ No newline at end of file diff --git a/lan/lan_vi.json b/lan/lan_vi.json index 3dbbf9e3..09204c78 100644 --- a/lan/lan_vi.json +++ b/lan/lan_vi.json @@ -1167,5 +1167,6 @@ "云存会员": "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!", "图像": "ả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ý" } \ No newline at end of file diff --git a/lan/lan_zh.json b/lan/lan_zh.json index 500e6450..6c3dc334 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1179,5 +1179,6 @@ "云存会员": "云存会员", "服务，图像视频信息随心存！": "服务，图像视频信息随心存！", "图像": "图像", - "视频": "视频" + "视频": "视频", + "当前国家不支持手机验证码注册，请使用邮箱进行注册": "当前国家不支持手机验证码注册，请使用邮箱进行注册" } \ No newline at end of file diff --git a/lib/blue/blue_manage.dart b/lib/blue/blue_manage.dart index 398171f6..1eecc7cb 100755 --- a/lib/blue/blue_manage.dart +++ b/lib/blue/blue_manage.dart @@ -16,8 +16,7 @@ import 'io_type.dart'; import 'reciver_data.dart'; //连接状态回调 -typedef ConnectStateCallBack = Function( - BluetoothConnectionState connectionState); +typedef ConnectStateCallBack = Function(BluetoothConnectionState connectionState); typedef ScanDevicesCallBack = Function(List); class BlueManage { @@ -62,8 +61,7 @@ class BlueManage { ScanResult? scanResult; // 监听蓝牙连接状态 - BluetoothConnectionState? bluetoothConnectionState = - BluetoothConnectionState.disconnected; + BluetoothConnectionState? bluetoothConnectionState = BluetoothConnectionState.disconnected; BluetoothAdapterState? _adapterState = BluetoothAdapterState.on; StreamSubscription? _adapterStateStateSubscription; @@ -103,7 +101,7 @@ class BlueManage { // 先取消之前的订阅，避免重复监听 _mtuSubscription?.cancel(); _mtuSubscription = null; - + _mtuSubscription = bluetoothConnectDevice!.mtu.listen((int value) { _mtuSize = value - 3; AppLog.log('设备MTU变化 - 原始值:$value 计算后MTU:$_mtuSize 设备:${bluetoothConnectDevice?.remoteId.str}'); @@ -111,8 +109,7 @@ class BlueManage { } void _initAdapterStateStateSubscription() { - _adapterStateStateSubscription ??= - FlutterBluePlus.adapterState.listen((BluetoothAdapterState state) { + _adapterStateStateSubscription ??= FlutterBluePlus.adapterState.listen((BluetoothAdapterState state) { AppLog.log('蓝牙状态:$state'); _adapterState = state; }); @@ -122,18 +119,15 @@ class BlueManage { _connectionStateSubscription?.cancel(); _connectionStateSubscription = null; - _connectionStateSubscription = bluetoothConnectDevice!.connectionState - .listen((BluetoothConnectionState state) async { + _connectionStateSubscription = + bluetoothConnectDevice!.connectionState.listen((BluetoothConnectionState state) async { bluetoothConnectionState = state; AppLog.log('蓝牙连接回调状态:$state'); }); } void _initSendStreamSubscription() { - _sendStreamSubscription ??= EventBusManager() - .eventBus! - .on() - .listen((EventSendModel model) { + _sendStreamSubscription ??= EventBusManager().eventBus!.on().listen((EventSendModel model) { AppLog.log('eventBus接收发送数据:${model}'); if (model.sendChannel == DataChannel.ble) { FlutterBluePlus.isSupported.then((bool isAvailable) async { @@ -158,8 +152,7 @@ class BlueManage { } /// 开始指定设备名称的扫描蓝牙设备 - Future startScanSingle(String deviceName, int timeout, - ScanDevicesCallBack scanDevicesCallBack) async { + Future startScanSingle(String deviceName, int timeout, ScanDevicesCallBack scanDevicesCallBack) async { final DateTime start = DateTime.now(); FlutterBluePlus.isSupported.then((bool isAvailable) async { if (isAvailable) { @@ -167,9 +160,7 @@ class BlueManage { if (_adapterState == BluetoothAdapterState.on) { try { BuglyTool.uploadException( - message: '开始指定设备名称的扫描蓝牙设备', - detail: '调用方法是:startScanSingle 指定设备名称是:$deviceName', - upload: false); + message: '开始指定设备名称的扫描蓝牙设备', detail: '调用方法是:startScanSingle 指定设备名称是:$deviceName', upload: false); //android 扫描比较慢，取样只要 3 分之一 final int divisor = Platform.isAndroid ? 3 : 1; FlutterBluePlus.startScan( @@ -181,12 +172,9 @@ class BlueManage { final StreamSubscription> subscription = FlutterBluePlus.scanResults.listen((List results) { final bool isExit = results.any((ScanResult element) => - (element.device.platformName == deviceName) || - (element.advertisementData.advName == deviceName)); - final int milliseconds = DateTime.now().millisecondsSinceEpoch - - start.millisecondsSinceEpoch; - AppLog.log( - '扫描到的设备数:${results.length} 是否查找到 $isExit 以查找$milliseconds毫秒'); + (element.device.platformName == deviceName) || (element.advertisementData.advName == deviceName)); + final int milliseconds = DateTime.now().millisecondsSinceEpoch - start.millisecondsSinceEpoch; + AppLog.log('扫描到的设备数:${results.length} 是否查找到 $isExit 以查找$milliseconds毫秒'); BuglyTool.uploadException( message: '指定设备名称的扫描蓝牙设备 监听扫描结果', detail: @@ -202,20 +190,15 @@ class BlueManage { } final isMatch = _isMatch( - scanResult.advertisementData.serviceUuids - .map((e) => e.uuid) - .toList(), + scanResult.advertisementData.serviceUuids.map((e) => e.uuid).toList(), isSingle: true, ); if (isMatch && (scanResult.rssi >= -100)) { // 查询id相同的元素 - final int knownDeviceIndex = scanDevices.indexWhere( - (ScanResult d) => - (d.device.platformName == - scanResult.device.platformName) || - (d.advertisementData.advName == - scanResult.advertisementData.advName)); + final int knownDeviceIndex = scanDevices.indexWhere((ScanResult d) => + (d.device.platformName == scanResult.device.platformName) || + (d.advertisementData.advName == scanResult.advertisementData.advName)); // 不存在的时候返回-1 if (knownDeviceIndex >= 0) { scanDevices[knownDeviceIndex] = scanResult; @@ -224,8 +207,7 @@ class BlueManage { } BuglyTool.uploadException( message: '遍历扫描到的结果跟缓存的结果对比，如果有最新的就更新缓存', - detail: - 'startScanSingle deviceName:$deviceName 查询到的结果scanResult:$scanResult', + detail: 'startScanSingle deviceName:$deviceName 查询到的结果scanResult:$scanResult', upload: false); } } @@ -234,9 +216,7 @@ class BlueManage { } }, onError: (e) { BuglyTool.uploadException( - message: '指定设备名称的扫描蓝牙设备 监听扫描结果失败', - detail: '打印失败问题 e：${e.toString()}', - upload: false); + message: '指定设备名称的扫描蓝牙设备 监听扫描结果失败', detail: '打印失败问题 e：${e.toString()}', upload: false); AppLog.log('扫描失败:$e'); }); FlutterBluePlus.cancelWhenScanComplete(subscription); @@ -245,9 +225,7 @@ class BlueManage { subscription.cancel(); } catch (e) { BuglyTool.uploadException( - message: '指定设备名称的扫描蓝牙设备 内部逻辑整形失败', - detail: 'tartScanSingle内部逻辑整形失败 e:${e.toString()}', - upload: false); + message: '指定设备名称的扫描蓝牙设备 内部逻辑整形失败', detail: 'tartScanSingle内部逻辑整形失败 e:${e.toString()}', upload: false); AppLog.log('扫描失败'); } } else { @@ -264,12 +242,11 @@ class BlueManage { } /// 开始扫描蓝牙设备 - Future startScan(int timeout, DeviceType deviceType, - ScanDevicesCallBack scanDevicesCallBack, + Future startScan(int timeout, DeviceType deviceType, ScanDevicesCallBack scanDevicesCallBack, {List? idList}) async { FlutterBluePlus.isSupported.then((bool isAvailable) async { if (isAvailable) { - // AppLog.log('startScan 蓝牙状态 系统蓝牙状态：$_adapterState 蓝牙连接状态：$bluetoothConnectionState'); + AppLog.log('startScan 蓝牙状态 系统蓝牙状态：$_adapterState 蓝牙连接状态：$bluetoothConnectionState'); if (_adapterState == BluetoothAdapterState.on) { try { FlutterBluePlus.startScan(timeout: Duration(seconds: timeout)); @@ -278,28 +255,23 @@ class BlueManage { scanDevices.clear(); for (final ScanResult scanResult in results) { if (scanResult.advertisementData.serviceUuids.isNotEmpty) { - // AppLog.log( - // '扫描到的设备：${scanResult.advertisementData.serviceUuids[0].toString()}====${scanResult.advertisementData.advName}'); + AppLog.log( + '扫描到的设备：${scanResult.advertisementData.serviceUuids[0].toString()}====${scanResult.advertisementData.advName}'); } else { continue; } final isMatch = _isMatch( - scanResult.advertisementData.serviceUuids - .map((e) => e.uuid) - .toList(), + scanResult.advertisementData.serviceUuids.map((e) => e.uuid).toList(), deviceType: deviceType, isSingle: false, ); // 判断名字为空的直接剔除 if (isMatch && (scanResult.rssi >= -100)) { // 查询id相同的元素 - final int knownDeviceIndex = scanDevices.indexWhere( - (ScanResult d) => - (d.device.platformName == - scanResult.device.platformName) || - (d.advertisementData.advName == - scanResult.advertisementData.advName)); + final int knownDeviceIndex = scanDevices.indexWhere((ScanResult d) => + (d.device.platformName == scanResult.device.platformName) || + (d.advertisementData.advName == scanResult.advertisementData.advName)); // 不存在的时候返回-1 if (knownDeviceIndex >= 0) { scanDevices[knownDeviceIndex] = scanResult; @@ -333,10 +305,8 @@ class BlueManage { } /// 判断是否包含指定的uuid - bool _isMatch(List serviceUuids, - {DeviceType deviceType = DeviceType.blue, required bool isSingle}) { - final List prefixes = - getDeviceType(deviceType).map((e) => e.toLowerCase()).toList(); + bool _isMatch(List serviceUuids, {DeviceType deviceType = DeviceType.blue, required bool isSingle}) { + final List prefixes = getDeviceType(deviceType).map((e) => e.toLowerCase()).toList(); for (String uuid in serviceUuids) { final String cleanUuid = uuid.toLowerCase(); if (cleanUuid.length == 8) { @@ -367,8 +337,7 @@ class BlueManage { } else { // 判断配对状态（带横杠UUID的第31、32位，从1开始计数） if (cleanUuid.length >= 32) { - String pairStatus = - cleanUuid.substring(30, 32); // 第31、32位（从1开始计数） + String pairStatus = cleanUuid.substring(30, 32); // 第31、32位（从1开始计数） // 00=未配对，01=已配对 if (pairStatus == '00') { return true; // 未配对才返回true @@ -386,12 +355,11 @@ class BlueManage { // 判断是否有新事件 bool hasNewEvent = (byte1 == 1); - // 返回是否未配对（原逻辑） - if (isPaired) { - return true; // 已配对返回false + if (!isPaired) { + return true; // 未配对返回true } else { - return false; // 未配对返回true + return false; // 配对返回false } } // 已配对（01）不返回true，继续判断下一个uuid @@ -408,8 +376,7 @@ class BlueManage { } else { // 判断配对状态（带横杠UUID的第31、32位，从1开始计数） if (cleanUuid.length >= 32) { - String pairStatus = - cleanUuid.substring(30, 32); // 第31、32位（从1开始计数） + String pairStatus = cleanUuid.substring(30, 32); // 第31、32位（从1开始计数） // 00=未配对，01=已配对 if (pairStatus == '00') { return true; // 未配对才返回true @@ -428,8 +395,10 @@ class BlueManage { /// 调用发送数据 List senderData, Future blueSendData( - String deviceName, ConnectStateCallBack stateCallBack, - {bool isAddEquipment = false}) async { + String deviceName, + ConnectStateCallBack stateCallBack, { + bool isAddEquipment = false, + }) async { FlutterBluePlus.isSupported.then((bool isAvailable) async { if (isAvailable) { // AppLog.log('蓝牙状态 系统蓝牙状态：$_adapterState 蓝牙连接状态：$bluetoothConnectionState'); @@ -438,12 +407,16 @@ class BlueManage { if (bluetoothConnectionState != BluetoothConnectionState.connected) { BuglyTool.uploadException( message: '点击按钮 蓝牙未连接 下一步扫描连接蓝牙', - detail: - 'blueSendData 蓝牙连接状态 bluetoothConnectionState：$bluetoothConnectionState deviceName:$deviceName', + detail: 'blueSendData 蓝牙连接状态 bluetoothConnectionState：$bluetoothConnectionState deviceName:$deviceName', upload: false); - _connect(deviceName, (BluetoothConnectionState state) { - stateCallBack(bluetoothConnectionState!); - }, isAddEquipment: isAddEquipment); + // 连接设备 + _connect( + deviceName, + (BluetoothConnectionState state) { + stateCallBack(bluetoothConnectionState!); + }, + isAddEquipment: isAddEquipment, + ); } else { BuglyTool.uploadException( message: '点击按钮 蓝牙已经连接 下一步扫描连接蓝牙', @@ -455,8 +428,7 @@ class BlueManage { } else { BuglyTool.uploadException( message: '点击按钮 蓝牙未打开', - detail: - 'blueSendData 蓝牙未打开--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName', + detail: 'blueSendData 蓝牙未打开--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName', upload: false); try { stateCallBack(BluetoothConnectionState.disconnected); @@ -465,16 +437,13 @@ class BlueManage { AppLog.log('蓝牙打开失败'); BuglyTool.uploadException( message: '点击按钮 蓝牙未打开 然后蓝牙打开失败', - detail: - 'blueSendData 蓝牙打开失败--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName', + detail: 'blueSendData 蓝牙打开失败--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName', upload: false); } } } else { BuglyTool.uploadException( - message: '点击按钮 蓝牙状态不可用', - detail: 'blueSendData 蓝牙状态不可用--isAvailable:$isAvailable', - upload: false); + message: '点击按钮 蓝牙状态不可用', detail: 'blueSendData 蓝牙状态不可用--isAvailable:$isAvailable', upload: false); stateCallBack(BluetoothConnectionState.disconnected); AppLog.log('开始扫描 蓝牙不可用，不能进行蓝牙操作'); } @@ -482,8 +451,7 @@ class BlueManage { } /// 连接 - Future _connect( - String deviceName, ConnectStateCallBack connectStateCallBack, + Future _connect(String deviceName, ConnectStateCallBack connectStateCallBack, {bool isAddEquipment = false}) async { connectDeviceName = deviceName; // 当前已扫描到的缓存设备 @@ -491,16 +459,12 @@ class BlueManage { // 是否有缓存设备 true是有缓存设备 final bool isExistDevice = isExistScanDevices(connectDeviceName); // 是否是当前设备 - final bool isCurrentDevice = - CommonDataManage().currentKeyInfo.lockName == deviceName; + final bool isCurrentDevice = CommonDataManage().currentKeyInfo.lockName == deviceName; // mac地址 final String? mac = CommonDataManage().currentKeyInfo.mac; AppLog.log('开始连接 是否存在缓存：$isExistDevice 是否是当前设备：$isCurrentDevice mac：$mac'); - if (GetPlatform.isAndroid && - !isExistDevice && - isCurrentDevice && - mac != null) { + if (GetPlatform.isAndroid && !isExistDevice && isCurrentDevice && mac != null) { // 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 BuglyTool.uploadException( message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect', @@ -512,22 +476,17 @@ class BlueManage { try { if (!needScanSingle) { BuglyTool.uploadException( - message: - '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect', + message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect', detail: '调用方法doNotSearchBLE，直接连接,needScanSingle：$needScanSingle', upload: false); - await doNotSearchBLE(mac, connectStateCallBack, - isAddEquipment: isAddEquipment); + await doNotSearchBLE(mac, connectStateCallBack, isAddEquipment: isAddEquipment); } else { BuglyTool.uploadException( - message: - '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect', - detail: - '调用方法startScanSingle，执行扫描函数,needScanSingle：$needScanSingle', + message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect', + detail: '调用方法startScanSingle，执行扫描函数,needScanSingle：$needScanSingle', upload: false); startScanSingle(deviceName, 15, (List scanDevices) { - _connectDevice(scanDevices, deviceName, connectStateCallBack, - isAddEquipment: isAddEquipment); + _connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment); }); } } catch (e) { @@ -536,8 +495,7 @@ class BlueManage { detail: '调用方法doNotSearchBLE发生异常，执行扫描函数 startScanSingle，异常信息：$e', upload: false); startScanSingle(deviceName, 15, (List scanDevices) { - _connectDevice(scanDevices, deviceName, connectStateCallBack, - isAddEquipment: isAddEquipment); + _connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment); }); } // @@ -554,16 +512,13 @@ class BlueManage { } else if (isAddEquipment == false && isExistDevice == false) { // 取消缓存直接使用，存在配对场景设备信息会更变 BuglyTool.uploadException( - message: - '取消缓存直接使用，存在配对场景设备信息会更变 然后开始指定设备名称的扫描蓝牙设备 上传记录当前方法是：_connect', - detail: - '符合条件(isAddEquipment == false && isExistDevice == false) 下一步调用startScanSingle', + message: '取消缓存直接使用，存在配对场景设备信息会更变 然后开始指定设备名称的扫描蓝牙设备 上传记录当前方法是：_connect', + detail: '符合条件(isAddEquipment == false && isExistDevice == false) 下一步调用startScanSingle', upload: false); // AppLog.log('无存在设备需要扫描 deviceName:$deviceName isAddEquipment:$isAddEquipment'); startScanSingle(deviceName, 15, (List scanDevices) { - _connectDevice(scanDevices, deviceName, connectStateCallBack, - isAddEquipment: isAddEquipment); + _connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment); }); } else { BuglyTool.uploadException( @@ -572,16 +527,14 @@ class BlueManage { '走这个方法是有缓存或者添加设备的时候以及不符合(GetPlatform.isAndroid && !isExistDevice && isCurrentDevice && mac != null) deviceName:$deviceName 直接调用_connectDevice', upload: false); // AppLog.log('安卓或者iOS 存在设备不需要扫描 deviceName:$deviceName isAddEquipment:$isAddEquipment'); - _connectDevice(devicesList, deviceName, connectStateCallBack, - isAddEquipment: isAddEquipment); + _connectDevice(devicesList, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment); } } //查找缓存里面是否有设备 bool isExistScanDevices(String connectDeviceName) { 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; } @@ -595,17 +548,15 @@ class BlueManage { // 判断数组列表里面是否有这个设备 // AppLog.log("devicesList:$devicesList"); - final int knownDeviceIndex = devicesList.indexWhere((ScanResult d) => - (d.device.platformName == deviceName) || - (d.advertisementData.advName == deviceName)); + final int knownDeviceIndex = devicesList.indexWhere( + (ScanResult d) => (d.device.platformName == deviceName) || (d.advertisementData.advName == deviceName)); ScanResult? scanResult; //使用局部变量防止出现缓存 if (knownDeviceIndex >= 0) { // 存在的时候赋值 - connectDeviceMacAddress = - devicesList[knownDeviceIndex].advertisementData.advName.isNotEmpty - ? devicesList[knownDeviceIndex].advertisementData.advName - : devicesList[knownDeviceIndex].device.platformName; + connectDeviceMacAddress = devicesList[knownDeviceIndex].advertisementData.advName.isNotEmpty + ? devicesList[knownDeviceIndex].advertisementData.advName + : devicesList[knownDeviceIndex].device.platformName; bluetoothConnectDevice = devicesList[knownDeviceIndex].device; scanResult = devicesList[knownDeviceIndex]; @@ -616,10 +567,8 @@ class BlueManage { } if (scanResult == null || connectDeviceMacAddress.isEmpty) { BuglyTool.uploadException( - message: - '扫描结果scanResult == null || connectDeviceMacAddress.isEmpty不往下执行 return 上传记录当前方法是：_connectDevice', - detail: - 'scanResult:$scanResult connectDeviceMacAddress：$connectDeviceMacAddress', + message: '扫描结果scanResult == null || connectDeviceMacAddress.isEmpty不往下执行 return 上传记录当前方法是：_connectDevice', + detail: 'scanResult:$scanResult connectDeviceMacAddress：$connectDeviceMacAddress', upload: false); return; } @@ -653,8 +602,7 @@ class BlueManage { BuglyTool.uploadException( message: '提示该锁已被重置, 回调断开连接, 清除缓存，上传记录当前方法是：_connectDevice', - detail: - 'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}', + detail: 'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}', upload: false); } return; @@ -686,8 +634,7 @@ class BlueManage { BuglyTool.uploadException( message: '提示该锁已被重置, 回调断开连接, 清除缓存，上传记录当前方法是：_connectDevice', - detail: - 'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}', + detail: 'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}', upload: false); } return; @@ -704,13 +651,11 @@ class BlueManage { } //直接给蓝牙设备写入 - Future doNotSearchBLE( - String masAdds, ConnectStateCallBack connectStateCallBack, + Future doNotSearchBLE(String masAdds, ConnectStateCallBack connectStateCallBack, {bool isAddEquipment = false}) async { await FlutterBluePlus.stopScan(); - if (bluetoothConnectDevice == null || - bluetoothConnectDevice?.remoteId.str != masAdds) { + if (bluetoothConnectDevice == null || bluetoothConnectDevice?.remoteId.str != masAdds) { bluetoothConnectDevice = BluetoothDevice.fromId(masAdds); _initGetMtuSubscription(); _initListenConnectionState(); @@ -721,25 +666,24 @@ class BlueManage { } else { BuglyTool.uploadException( message: '直接给蓝牙设备写入 上传记录当前方法是：doNotSearchBLE', - detail: - '直接给蓝牙设备写入 用传入的bluetoothConnectDevice：${bluetoothConnectDevice.toString()}连接 masAdds:$masAdds', + detail: '直接给蓝牙设备写入 用传入的bluetoothConnectDevice：${bluetoothConnectDevice.toString()}连接 masAdds:$masAdds', upload: false); } //尝试连接设备 - await bluetoothDeviceConnect(bluetoothConnectDevice!, connectStateCallBack, - isAddEquipment: isAddEquipment); + await bluetoothDeviceConnect(bluetoothConnectDevice!, connectStateCallBack, isAddEquipment: isAddEquipment); } //设备连接 - Future bluetoothDeviceConnect(BluetoothDevice bluetoothConnectDevice, - ConnectStateCallBack connectStateCallBack, + Future bluetoothDeviceConnect(BluetoothDevice bluetoothConnectDevice, ConnectStateCallBack connectStateCallBack, {bool isAddEquipment = false}) async { // 重连三次 const int maxAttempts = 3; int attempt = 0; while (attempt < maxAttempts) { try { - await bluetoothConnectDevice.connect(timeout: 5.seconds); + await bluetoothConnectDevice.connect( + timeout: 5.seconds, + ); break; // If the connection is successful, break the loop } catch (e) { AppLog.log('连接失败 重连了: $e'); @@ -754,8 +698,7 @@ class BlueManage { AppLog.log('$maxAttempts次后尝试连接失败'); BuglyTool.uploadException( message: '连接三次超时断开连接 回调断开连接 上传记录当前方法是：bluetoothDeviceConnect', - detail: - 'bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} $maxAttempts次后尝试连接失败', + detail: 'bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} $maxAttempts次后尝试连接失败', upload: false); needScanSingle = true; connectStateCallBack(BluetoothConnectionState.disconnected); @@ -764,22 +707,18 @@ class BlueManage { if (bluetoothConnectionState == BluetoothConnectionState.connected) { try { needScanSingle = false; - final List services = - await bluetoothConnectDevice.discoverServices(); + final List services = await bluetoothConnectDevice.discoverServices(); //循环判断服务 for (final BluetoothService service in services) { if (service.uuid == _serviceIdConnect) { - for (final BluetoothCharacteristic characteristic - in service.characteristics) { - if (characteristic.characteristicUuid == - _characteristicIdSubscription) { + for (final BluetoothCharacteristic characteristic in service.characteristics) { + if (characteristic.characteristicUuid == _characteristicIdSubscription) { _subScribeToCharacteristic(characteristic); bluetoothConnectionState = BluetoothConnectionState.connected; connectStateCallBack(bluetoothConnectionState!); BuglyTool.uploadException( message: '订阅成功 上传记录当前方法是：bluetoothDeviceConnect', - detail: - '发现服务，连接成功，订阅数据 bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} ', + detail: '发现服务，连接成功，订阅数据 bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} ', upload: false); } else { BuglyTool.uploadException( @@ -801,22 +740,18 @@ class BlueManage { needScanSingle = true; bluetoothConnectionState = BluetoothConnectionState.disconnected; connectStateCallBack(bluetoothConnectionState!); - AppLog.log( - '发现设备时失败 e:$e bluetoothConnectionState:$bluetoothConnectionState'); + AppLog.log('发现设备时失败 e:$e bluetoothConnectionState:$bluetoothConnectionState'); BuglyTool.uploadException( message: '发现服务时失败', - detail: - '发现服务时报错原因e：$e bluetoothDeviceConnect:${bluetoothConnectDevice.toString()}', + detail: '发现服务时报错原因e：$e bluetoothDeviceConnect:${bluetoothConnectDevice.toString()}', upload: false); rethrow; } } } - Future _subScribeToCharacteristic( - BluetoothCharacteristic characteristic) async { - final StreamSubscription> subscription = - characteristic.onValueReceived.listen((List data) { + Future _subScribeToCharacteristic(BluetoothCharacteristic characteristic) async { + final StreamSubscription> subscription = characteristic.onValueReceived.listen((List data) { AppLog.log('订阅获取的数据： $data '); if (data == lastTimeData || data.isEmpty) { return; @@ -864,10 +799,7 @@ class BlueManage { return false; } //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; } else { return false; @@ -876,12 +808,10 @@ class BlueManage { /// 写入蓝牙特征值，并等待响应 Future writeCharacteristicWithResponse(List value) async { - final List services = - await bluetoothConnectDevice!.discoverServices(); + final List services = await bluetoothConnectDevice!.discoverServices(); for (final BluetoothService service in services) { if (service.uuid == _serviceIdConnect) { - for (final BluetoothCharacteristic characteristic - in service.characteristics) { + for (final BluetoothCharacteristic characteristic in service.characteristics) { if (characteristic.characteristicUuid == _characteristicIdWrite) { try { // 添加重试机制 @@ -900,27 +830,22 @@ class BlueManage { while (!packetSent && retryCount < maxRetries) { try { if (characteristic.properties.writeWithoutResponse) { - await characteristic.write(subData[i], - withoutResponse: true); + await characteristic.write(subData[i], withoutResponse: true); } else if (characteristic.properties.write) { await characteristic.write(subData[i]); } else { // 特性不支持写入 - throw Exception( - 'This characteristic does not support writing.'); + throw Exception('This characteristic does not support writing.'); } // 如果到这里没有异常，则包发送成功 packetSent = true; } 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，尝试重试 retryCount++; - AppLog.log( - '蓝牙写入失败(GATT 133)，数据包 ${i + 1}/${subData.length} 正在重试 $retryCount/$maxRetries...'); - await Future.delayed( - Duration(milliseconds: retryDelayMs)); + AppLog.log('蓝牙写入失败(GATT 133)，数据包 ${i + 1}/${subData.length} 正在重试 $retryCount/$maxRetries...'); + await Future.delayed(Duration(milliseconds: retryDelayMs)); continue; } else { // 其他错误或已达到最大重试次数，抛出异常 @@ -931,8 +856,7 @@ class BlueManage { } if (!packetSent) { - throw Exception( - '蓝牙写入失败，数据包 ${i + 1}/${subData.length} 已达到最大重试次数'); + throw Exception('蓝牙写入失败，数据包 ${i + 1}/${subData.length} 已达到最大重试次数'); } } @@ -964,21 +888,19 @@ class BlueManage { Future disconnect() async { try { connectDeviceMacAddress = ''; - + // 清理MTU监听 _mtuSubscription?.cancel(); _mtuSubscription = null; _mtuSize = 20; // 重置MTU为默认值 - + if (bluetoothConnectionState == BluetoothConnectionState.connected) { + AppLog.log('请求断开蓝牙连接'); //加快蓝牙断连 - await bluetoothConnectDevice!.disconnect(timeout: 3); - AppLog.log('断开连接成功'); + await bluetoothConnectDevice!.disconnect(timeout: 1); } } on Exception catch (e, _) { AppLog.log('断开连接失败: $e'); - } finally { - bluetoothConnectionState = BluetoothConnectionState.disconnected; } } @@ -1006,7 +928,7 @@ class BlueManage { _mtuSubscription?.cancel(); _adapterStateStateSubscription?.cancel(); _connectionStateSubscription?.cancel(); - + // 重置状态 _mtuSize = 20; connectDeviceName = ''; diff --git a/lib/login/register/starLock_register_logic.dart b/lib/login/register/starLock_register_logic.dart index 5796d422..b0731e23 100755 --- a/lib/login/register/starLock_register_logic.dart +++ b/lib/login/register/starLock_register_logic.dart @@ -84,14 +84,13 @@ class StarLockRegisterLogic extends BaseGetXController { } Future sendValidationCode() async { - final SendValidationCodeEntity entity = - await ApiRepository.to.sendValidationCodeUnLogin( - // state.countryCode.value, - countryCode: state.countryCode.value.toString(), - account: state.phoneOrEmailStr.value, - channel: state.isIphoneType.value ? '1' : '2', - codeType: '1', - xWidth: state.xWidth.value.toString()); + final SendValidationCodeEntity entity = await ApiRepository.to.sendValidationCodeUnLogin( + // state.countryCode.value, + countryCode: state.countryCode.value.toString(), + account: state.phoneOrEmailStr.value, + channel: state.isIphoneType.value ? '1' : '2', + codeType: '1', + xWidth: state.xWidth.value.toString()); if (entity.errorCode!.codeIsSuccessful) { _startTimer(); } else {} @@ -100,13 +99,16 @@ class StarLockRegisterLogic extends BaseGetXController { Future checkIpAction() async { final CheckIPEntity entity = await ApiRepository.to.checkIpAction(ip: ''); if (entity.errorCode!.codeIsSuccessful) { + if (entity.data!.abbreviation != 'CN') { + showToast('当前国家不支持手机验证码注册，请使用邮箱进行注册'.tr); + return; + } if (state.countryName.value != entity.data!.name) { ShowTipView().showSureAlertDialog( - '国家地区的选择将影响数据安全，你当前选择的是'.tr + - '${state.countryName.value},' + - '请确认后再继续'.tr, - tipTitle: '确认国家或地区'.tr, - sureStr: '我知道了'.tr); + '国家地区的选择将影响数据安全，你当前选择的是'.tr + '${state.countryName.value},' + '请确认后再继续'.tr, + tipTitle: '确认国家或地区'.tr, + sureStr: '我知道了'.tr, + ); } } } @@ -138,15 +140,12 @@ class StarLockRegisterLogic extends BaseGetXController { // 重置是否能提交 void _resetCanSub() { - state.canSub.value = state.pwdIsOK && - state.codeIsOK && - state.phoneOrEmailStr.value.isNotEmpty; + state.canSub.value = state.pwdIsOK && state.codeIsOK && state.phoneOrEmailStr.value.isNotEmpty; } // 重置是否能发送验证码 void _resetCanSendCode() { - state.canSendCode.value = - state.pwdIsOK && state.phoneOrEmailStr.value.isNotEmpty; + state.canSendCode.value = state.pwdIsOK && state.phoneOrEmailStr.value.isNotEmpty; } @override diff --git a/lib/login/register/starLock_register_page.dart b/lib/login/register/starLock_register_page.dart index cec34d5a..279010d0 100755 --- a/lib/login/register/starLock_register_page.dart +++ b/lib/login/register/starLock_register_page.dart @@ -4,7 +4,10 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_settings.dart'; +import 'package:star_lock/login/register/entity/checkIP_entity.dart'; import 'package:star_lock/login/register/starLock_register_state.dart'; +import 'package:star_lock/network/api_repository.dart'; +import 'package:star_lock/tools/baseGetXController.dart'; import '../../appRouters.dart'; import '../../app_settings/app_colors.dart'; @@ -79,7 +82,8 @@ class _StarLockRegisterPageState extends State { width: 340.w, height: 60.h, decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(30.h)), border: Border.all(width: 1.0, color: AppColors.greyLineColor)), + borderRadius: BorderRadius.all(Radius.circular(30.h)), + border: Border.all(width: 1.0, color: AppColors.greyLineColor)), child: Row( children: [ GestureDetector( @@ -153,13 +157,16 @@ class _StarLockRegisterPageState extends State { child: Row( children: [ SizedBox(width: 5.w), - Expanded(child: Text('你所在的国家/地区'.tr, style: TextStyle(fontSize: 26.sp, color: AppColors.blackColor))), + Expanded( + child: Text('你所在的国家/地区'.tr, style: TextStyle(fontSize: 26.sp, color: AppColors.blackColor))), SizedBox(width: 20.w), Row( mainAxisAlignment: MainAxisAlignment.end, children: [ Text( - state.isIphoneType.value ? '${state.countryName.value} +${state.countryCode.value}' : state.countryName.value, + state.isIphoneType.value + ? '${state.countryName.value} +${state.countryCode.value}' + : state.countryName.value, textAlign: TextAlign.end, style: TextStyle(fontSize: 26.sp, color: AppColors.blackColor), ) @@ -279,9 +286,19 @@ class _StarLockRegisterPageState extends State { Obx(() => GestureDetector( onTap: (state.canSendCode.value && state.canResend.value) ? () async { + final CheckIPEntity entity = await ApiRepository.to.checkIpAction(ip: ''); + if (entity.errorCode!.codeIsSuccessful) { + if (entity.data!.abbreviation != 'CN') { + logic.showToast('当前国家不支持手机验证码注册，请使用邮箱进行注册'.tr); + return; + } + } // Navigator.pushNamed(context, Routers.safetyVerificationPage, arguments: {"countryCode":"+86", "account":state.phoneOrEmailStr.value}); final Object? result = await Navigator.pushNamed(context, Routers.safetyVerificationPage, - arguments: {'countryCode': state.countryCode, 'account': state.phoneOrEmailStr.value}); + arguments: { + 'countryCode': state.countryCode, + 'account': state.phoneOrEmailStr.value + }); state.xWidth.value = (result! as Map)['xWidth']; logic.sendValidationCode(); } @@ -338,7 +355,8 @@ class _StarLockRegisterPageState extends State { child: GestureDetector( child: Text('《${'用户协议'.tr}》', style: TextStyle(color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { - Get.toNamed(Routers.webviewShowPage, arguments: {'url': XSConstantMacro.userAgreementURL, 'title': '用户协议'.tr}); + Get.toNamed(Routers.webviewShowPage, + arguments: {'url': XSConstantMacro.userAgreementURL, 'title': '用户协议'.tr}); }, )), WidgetSpan( @@ -346,7 +364,8 @@ class _StarLockRegisterPageState extends State { child: GestureDetector( child: Text('《${'隐私政策'.tr}》', style: TextStyle(color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { - Get.toNamed(Routers.webviewShowPage, arguments: {'url': XSConstantMacro.privacyPolicyURL, 'title': '隐私政策'.tr}); + Get.toNamed(Routers.webviewShowPage, + arguments: {'url': XSConstantMacro.privacyPolicyURL, 'title': '隐私政策'.tr}); }, )), ], diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index e122ccf1..42fd92df 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -165,6 +165,7 @@ class LockDetailLogic extends BaseGetXController { } _handleSynchronizeUploadLockData(); + break; case 0x06: //无权限 @@ -928,28 +929,31 @@ class LockDetailLogic extends BaseGetXController { } void _handleGetLockPasswordData() { - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { - if (connectionState == BluetoothConnectionState.connected) { - final List? token = await Storage.getStringList(saveBlueToken); - final List getTokenList = changeStringListToIntList(token!); + BlueManage().blueSendData( + BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { + if (connectionState == BluetoothConnectionState.connected) { + final List? token = await Storage.getStringList(saveBlueToken); + final List getTokenList = changeStringListToIntList(token!); - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); - final List getPrivateKeyList = changeStringListToIntList(privateKey!); + final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List getPrivateKeyList = changeStringListToIntList(privateKey!); - final List? signKey = await Storage.getStringList(saveBlueSignKey); - final List signKeyDataList = changeStringListToIntList(signKey!); + final List? signKey = await Storage.getStringList(saveBlueSignKey); + final List signKeyDataList = changeStringListToIntList(signKey!); - IoSenderManage.updataLockPasswordListCommand( - lockID: BlueManage().connectDeviceName, - userID: await Storage.getUid(), - page: state.uploadPasswordPage, - countReq: state.countReq, - token: getTokenList, - needAuthor: 1, - signKey: signKeyDataList, - privateKey: getPrivateKeyList); - } - }); + IoSenderManage.updataLockPasswordListCommand( + lockID: BlueManage().connectDeviceName, + userID: await Storage.getUid(), + page: state.uploadPasswordPage, + countReq: state.countReq, + token: getTokenList, + needAuthor: 1, + signKey: signKeyDataList, + privateKey: getPrivateKeyList); + } + }, + ); } // 上传数据获取锁密码列表 @@ -963,7 +967,7 @@ class LockDetailLogic extends BaseGetXController { // 当数据是10的时候继续请求 state.uploadPasswordPage = state.uploadPasswordPage + 1; final List token = reply.data.sublist(3, 7); - showEasyLoading(); + BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? privateKey = await Storage.getStringList(saveBluePrivateKey); @@ -1067,7 +1071,6 @@ class LockDetailLogic extends BaseGetXController { final List token = reply.data.sublist(3, 7); - showEasyLoading(); BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? privateKey = await Storage.getStringList(saveBluePrivateKey); @@ -1171,7 +1174,6 @@ class LockDetailLogic extends BaseGetXController { final List token = reply.data.sublist(3, 7); - showEasyLoading(); BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? privateKey = await Storage.getStringList(saveBluePrivateKey); @@ -1325,7 +1327,6 @@ class LockDetailLogic extends BaseGetXController { final List token = reply.data.sublist(3, 7); - showEasyLoading(); BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? privateKey = await Storage.getStringList(saveBluePrivateKey); @@ -1402,7 +1403,6 @@ class LockDetailLogic extends BaseGetXController { final List token = reply.data.sublist(3, 7); - showEasyLoading(); BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? privateKey = await Storage.getStringList(saveBluePrivateKey); @@ -1479,7 +1479,6 @@ class LockDetailLogic extends BaseGetXController { final List token = reply.data.sublist(3, 7); - showEasyLoading(); BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? privateKey = await Storage.getStringList(saveBluePrivateKey); @@ -1503,6 +1502,8 @@ class LockDetailLogic extends BaseGetXController { } else { state.indexCount.value = state.indexCount.value + 1; _lockDataUpload(uploadType: 2, recordType: 7, records: state.uploadRemoteControlDataList); + AppLog.log('需要执行断开操作'); + BlueManage().disconnect(); } break; case 0x06: diff --git a/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart b/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart index 8e22bbb8..f76a2fff 100644 --- a/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart +++ b/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart @@ -45,8 +45,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { @override void onInit() async { super.onInit(); - _replySubscription = - EventBusManager().eventBus!.on().listen((Reply reply) async { + _replySubscription = EventBusManager().eventBus!.on().listen((Reply reply) async { if (reply is VoicePackageConfigureReply) { // 语言包配置开始 _handlerStartVoicePackageConfigure(reply); @@ -72,8 +71,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { final vendor = state.lockSetInfoData.value.lockBasicInfo?.vendor; 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!, 'model': model!, }); @@ -110,18 +108,15 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { final passthroughItem = PassthroughItem( lang: element.lang, timbres: element.timbres, - langText: - ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle, + langText: ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle, name: element.name, ); state.languages.add(passthroughItem); } }); state.languages.refresh(); - final lang = state - .lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang; - final timbre = state - .lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre; + final lang = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang; + final timbre = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre; // 传统 for 循环，直接通过索引访问 for (int i = 0; i < state.languages.length; i++) { final language = state.languages[i]; // 当前元素 @@ -156,8 +151,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { // APP层的语言 Locale? currentLocale = Get.locale; // 直接获取最新语言 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; } } @@ -192,15 +186,11 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { showBlueConnetctToastTimer(action: () { dismissEasyLoading(); }); - BlueManage().blueSendData(BlueManage().connectDeviceName, - (BluetoothConnectionState deviceConnectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { if (deviceConnectionState == BluetoothConnectionState.connected) { - final List? privateKey = - await Storage.getStringList(saveBluePrivateKey); - final List getPrivateKeyList = - changeStringListToIntList(privateKey!); - final List? signKey = - await Storage.getStringList(saveBlueSignKey); + final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List getPrivateKeyList = changeStringListToIntList(privateKey!); + final List? signKey = await Storage.getStringList(saveBlueSignKey); final List signKeyDataList = changeStringListToIntList(signKey!); final String uid = await Storage.getUid() ?? ''; final String md5Str = md5.convert(data).toString().toUpperCase(); @@ -219,8 +209,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { privateKey: getPrivateKeyList) .packageData(), ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { + } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); } @@ -233,16 +222,14 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { showBlueConnetctToastTimer(action: () { dismissEasyLoading(); }); - BlueManage().blueSendData(BlueManage().connectDeviceName, - (BluetoothConnectionState deviceConnectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { if (deviceConnectionState == BluetoothConnectionState.connected) { BlueManage().writeCharacteristicWithResponse( GetDeviceModelCommand( lockID: BlueManage().connectDeviceName, ).packageData(), ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { + } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); showBlueConnetctToast(); @@ -251,8 +238,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { } // 开始配置语音包 - void _handlerStartVoicePackageConfigure( - VoicePackageConfigureReply reply) async { + void _handlerStartVoicePackageConfigure(VoicePackageConfigureReply reply) async { final int status = reply.data[6]; switch (status) { case 0x00: @@ -280,8 +266,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { if (state.data == null) return; state.voiceSubcontractingIndex = 0; state.voiceSubcontractingCount = - (state.data!.length + state.voiceSubcontractingSize - 1) ~/ - state.voiceSubcontractingSize; + (state.data!.length + state.voiceSubcontractingSize - 1) ~/ state.voiceSubcontractingSize; state.progress.value = 0.0; // 开始前重置进度 _sendNextPackage(); } @@ -332,8 +317,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { 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, status: '正在发送数据 ${(state.progress.value * 100).toStringAsFixed(0)}%'); await _sendLanguageFileBleMessage( @@ -342,8 +326,7 @@ 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, (BluetoothConnectionState deviceConnectionState) async { if (deviceConnectionState == BluetoothConnectionState.connected) { @@ -354,17 +337,15 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { data: data, ).packageData(), ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { + } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); - showBlueConnetctToast(); + // showBlueConnetctToast(); } }); } - void _handlerVoicePackageConfigureProcess( - VoicePackageConfigureProcessReply reply) { + void _handlerVoicePackageConfigureProcess(VoicePackageConfigureProcessReply reply) { // 取消超时定时器（已收到回复，无需继续等待） _sendTimeoutTimer?.cancel(); _isTimeout = false; // 重置超时标志 @@ -431,8 +412,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { }); } - Future _executeLogic( - VoicePackageConfigureConfirmationReply reply) async { + Future _executeLogic(VoicePackageConfigureConfirmationReply reply) async { await _handlerVoicePackageConfigureConfirmation(reply); } @@ -440,9 +420,12 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { VoicePackageConfigureConfirmationReply reply, ) async { showEasyLoading(); - showBlueConnetctToastTimer(action: () { - dismissEasyLoading(); - }); + showBlueConnetctToastTimer( + action: () { + dismissEasyLoading(); + }, + isShowBlueConnetctToast: false, + ); final LoginEntity entity = await ApiRepository.to.settingCurrentVoiceTimbre( data: { 'lang': state.tempLangStr.value, @@ -452,10 +435,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { ); if (entity.errorCode!.codeIsSuccessful) { showSuccess('设置成功'.tr, something: () async { - state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang = - state.tempLangStr.value; - state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre - ?.timbre = state.tempTimbreStr.value; + state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang = state.tempLangStr.value; + state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre = state.tempTimbreStr.value; await BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { @@ -466,11 +447,10 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { languageCode: state.tempLangStr.value, ).packageData(), ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { + } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); - showBlueConnetctToast(); + // showBlueConnetctToast(); } }); await Future.delayed(Duration(seconds: 1)); @@ -491,8 +471,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { } } - void handleLockCurrentVoicePacketResult( - ReadLockCurrentVoicePacketReply reply) { + void handleLockCurrentVoicePacketResult(ReadLockCurrentVoicePacketReply reply) { final int status = reply.data[2]; switch (status) { case 0x00: @@ -501,25 +480,21 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { const int languageCodeStartIndex = 3; const int languageCodeLength = 20; - const int languageCodeEndIndex = - languageCodeStartIndex + languageCodeLength; // 23 + const int languageCodeEndIndex = languageCodeStartIndex + languageCodeLength; // 23 if (reply.data.length < languageCodeEndIndex) { throw Exception( 'Reply data is too short to contain LanguageCode. Expected at least $languageCodeEndIndex bytes, got ${reply.data.length}'); } - List languageCodeBytes = - reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex); + List languageCodeBytes = reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex); String languageCode = String.fromCharCodes(languageCodeBytes); languageCode = languageCode.trim(); // 移除首尾空格 - languageCode = - languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes) + languageCode = languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes) 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) { print('锁板上的语言是:$languageCode,下标是:$indexWhere'); state.selectPassthroughListIndex.value = indexWhere; @@ -541,9 +516,11 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { void readLockLanguage() async { showEasyLoading(); - showBlueConnetctToastTimer(action: () { - dismissEasyLoading(); - }); + showBlueConnetctToastTimer( + isShowBlueConnetctToast: false, + action: () { + dismissEasyLoading(); + }); await BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { if (deviceConnectionState == BluetoothConnectionState.connected) { @@ -552,11 +529,10 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { lockID: BlueManage().connectDeviceName, ).packageData(), ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { + } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); - showBlueConnetctToast(); + // showBlueConnetctToast(); } }); } diff --git a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart index 3adcc054..dbe0c0d2 100644 --- a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart +++ b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart @@ -43,8 +43,7 @@ class LockVoiceSettingLogic extends BaseGetXController { @override void onInit() async { super.onInit(); - _replySubscription = - EventBusManager().eventBus!.on().listen((Reply reply) async { + _replySubscription = EventBusManager().eventBus!.on().listen((Reply reply) async { if (reply is VoicePackageConfigureReply) { // 语言包配置开始 _handlerStartVoicePackageConfigure(reply); @@ -78,12 +77,14 @@ class LockVoiceSettingLogic extends BaseGetXController { }); } - Future _executeLogic( - VoicePackageConfigureConfirmationReply reply) async { + Future _executeLogic(VoicePackageConfigureConfirmationReply reply) async { showEasyLoading(); - showBlueConnetctToastTimer(action: () { - dismissEasyLoading(); - }); + showBlueConnetctToastTimer( + action: () { + dismissEasyLoading(); + }, + isShowBlueConnetctToast: false, + ); final LoginEntity entity = await ApiRepository.to.settingCurrentVoiceTimbre( data: { 'lang': state.tempLangStr.value, @@ -93,10 +94,8 @@ class LockVoiceSettingLogic extends BaseGetXController { ); if (entity.errorCode!.codeIsSuccessful) { showSuccess('设置成功'.tr, something: () async { - state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang = - state.tempLangStr.value; - state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre - ?.timbre = state.tempTimbreStr.value; + state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang = state.tempLangStr.value; + state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre = state.tempTimbreStr.value; await BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { @@ -107,16 +106,14 @@ class LockVoiceSettingLogic extends BaseGetXController { languageCode: state.tempLangStr.value, ).packageData(), ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { + } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); - showBlueConnetctToast(); + // showBlueConnetctToast(); } }); await Future.delayed(Duration(seconds: 1)); - eventBus - .fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); + eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); Get.offAllNamed(Routers.starLockMain); }); } @@ -145,8 +142,7 @@ class LockVoiceSettingLogic extends BaseGetXController { // APP层的语言 Locale? currentLocale = Get.locale; // 直接获取最新语言 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; } } @@ -176,15 +172,11 @@ class LockVoiceSettingLogic extends BaseGetXController { showBlueConnetctToastTimer(action: () { dismissEasyLoading(); }); - BlueManage().blueSendData(BlueManage().connectDeviceName, - (BluetoothConnectionState deviceConnectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { if (deviceConnectionState == BluetoothConnectionState.connected) { - final List? privateKey = - await Storage.getStringList(saveBluePrivateKey); - final List getPrivateKeyList = - changeStringListToIntList(privateKey!); - final List? signKey = - await Storage.getStringList(saveBlueSignKey); + final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List getPrivateKeyList = changeStringListToIntList(privateKey!); + final List? signKey = await Storage.getStringList(saveBlueSignKey); final List signKeyDataList = changeStringListToIntList(signKey!); final String uid = await Storage.getUid() ?? ''; final String md5Str = md5.convert(data).toString().toUpperCase(); @@ -203,8 +195,7 @@ class LockVoiceSettingLogic extends BaseGetXController { privateKey: getPrivateKeyList) .packageData(), ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { + } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); @@ -216,8 +207,7 @@ class LockVoiceSettingLogic extends BaseGetXController { }); } - void _handlerVoicePackageConfigureProcess( - VoicePackageConfigureProcessReply reply) { + void _handlerVoicePackageConfigureProcess(VoicePackageConfigureProcessReply reply) { // 取消超时定时器（已收到回复，无需继续等待） _sendTimeoutTimer?.cancel(); _isTimeout = false; // 重置超时标志 @@ -235,8 +225,7 @@ class LockVoiceSettingLogic extends BaseGetXController { } // 开始配置语音包 - void _handlerStartVoicePackageConfigure( - VoicePackageConfigureReply reply) async { + void _handlerStartVoicePackageConfigure(VoicePackageConfigureReply reply) async { final int status = reply.data[6]; switch (status) { case 0x00: @@ -265,8 +254,7 @@ class LockVoiceSettingLogic extends BaseGetXController { final vendor = state.lockSetInfoData.value.lockBasicInfo?.vendor; 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!, 'model': model!, }); @@ -302,8 +290,7 @@ class LockVoiceSettingLogic extends BaseGetXController { final passthroughItem = PassthroughItem( lang: element.lang, timbres: element.timbres, - langText: - ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle, + langText: ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle, name: element.name, ); @@ -311,10 +298,8 @@ class LockVoiceSettingLogic extends BaseGetXController { } }); state.languages.refresh(); - final lang = state - .lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang; - final timbre = state - .lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre; + final lang = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang; + final timbre = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre; state.languages.value.forEach((element) { final timbres = element.timbres; timbres.forEach((item) { @@ -335,8 +320,7 @@ class LockVoiceSettingLogic extends BaseGetXController { if (state.data == null) return; state.voiceSubcontractingIndex = 0; state.voiceSubcontractingCount = - (state.data!.length + state.voiceSubcontractingSize - 1) ~/ - state.voiceSubcontractingSize; + (state.data!.length + state.voiceSubcontractingSize - 1) ~/ state.voiceSubcontractingSize; state.progress.value = 0.0; // 开始前重置进度 _sendNextPackage(); } @@ -380,8 +364,7 @@ class LockVoiceSettingLogic extends BaseGetXController { 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, status: '正在发送数据 ${(state.progress.value * 100).toStringAsFixed(0)}%'); _sendLanguageFileBleMessage( @@ -391,8 +374,7 @@ class LockVoiceSettingLogic extends BaseGetXController { } _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) { BlueManage().writeCharacteristicWithResponse( VoicePackageConfigureProcess( @@ -401,8 +383,7 @@ class LockVoiceSettingLogic extends BaseGetXController { data: data, ).packageData(), ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { + } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); // showBlueConnetctToast(); @@ -445,9 +426,12 @@ class LockVoiceSettingLogic extends BaseGetXController { void readLockLanguage() async { showEasyLoading(); - showBlueConnetctToastTimer(action: () { - dismissEasyLoading(); - }); + showBlueConnetctToastTimer( + action: () { + dismissEasyLoading(); + }, + isShowBlueConnetctToast: false, + ); await BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async { if (deviceConnectionState == BluetoothConnectionState.connected) { @@ -456,17 +440,15 @@ class LockVoiceSettingLogic extends BaseGetXController { lockID: BlueManage().connectDeviceName, ).packageData(), ); - } else if (deviceConnectionState == - BluetoothConnectionState.disconnected) { + } else if (deviceConnectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); - showBlueConnetctToast(); + // showBlueConnetctToast(); } }); } - void handleLockCurrentVoicePacketResult( - ReadLockCurrentVoicePacketReply reply) { + void handleLockCurrentVoicePacketResult(ReadLockCurrentVoicePacketReply reply) { final int status = reply.data[2]; switch (status) { case 0x00: @@ -475,28 +457,24 @@ class LockVoiceSettingLogic extends BaseGetXController { const int languageCodeStartIndex = 3; const int languageCodeLength = 20; - const int languageCodeEndIndex = - languageCodeStartIndex + languageCodeLength; // 23 + const int languageCodeEndIndex = languageCodeStartIndex + languageCodeLength; // 23 if (reply.data.length < languageCodeEndIndex) { throw Exception( 'Reply data is too short to contain LanguageCode. Expected at least $languageCodeEndIndex bytes, got ${reply.data.length}'); } - List languageCodeBytes = - reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex); + List languageCodeBytes = reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex); String languageCode = String.fromCharCodes(languageCodeBytes); languageCode = languageCode.trim(); // 移除首尾空格 - languageCode = - languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes) + languageCode = languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes) print('LanguageCode: $languageCode'); // 例如: zh_CN, en_US 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) { print('锁板上的语言是:$languageCode,下标是:$indexWhere'); state.selectPassthroughListIndex.value = indexWhere; diff --git a/pubspec.yaml b/pubspec.yaml index 9897052e..608005ad 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -176,7 +176,7 @@ dependencies: url_launcher: ^6.1.10 #蓝牙 # flutter_reactive_ble: ^5.1.1 - flutter_blue_plus: 1.32.7 + flutter_blue_plus: 1.33.0 # event_bus: ^2.0.0 #菊花 @@ -235,6 +235,7 @@ dependencies: # ffmpeg_kit_flutter: 5.1.0-LTS fast_gbk: ^1.0.0 flutter_pcm_sound: ^1.1.0 + intl: ^0.18.0 # flutter_audio_capture: <1.1.5 @@ -246,7 +247,7 @@ dependencies: #侧滑删除 flutter_slidable: ^3.0.1 # audio_service: ^0.18.12 - app_settings: ^5.1.1 + app_settings: ^6.1.1 flutter_local_notifications: ^17.0.0 fluwx: 4.5.5 system_settings: ^2.0.0