fix: 增加日志

Reviewed-on: #2

.gitea/workflows/ci.yml

@@ -0,0 +1,251 @@
+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: 1
+
+      # 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" >> $GITEA_OUTPUT
+           echo "NEXT_TAG=$NEXT_TAG" >> $GITEA_OUTPUT
+           echo "INCREMENT_COUNT=$INCREMENT_COUNT" >> $GITEA_OUTPUT
+
+          # 输出版本信息
+          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: 1
+      # 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"
+          
+          # 获取版本信息（从basic-setup任务传递）
+          echo "🔍 Getting version info from basic-setup job..."
+          
+          # 设置默认版本号，如果环境变量为空
+          if [ -z "${{ needs.basic-setup.outputs.NEXT_VERSION }}" ]; then
+            VERSION_FOR_FILENAME="1-0-0"
+            echo "⚠️  Version not found, using default: $VERSION_FOR_FILENAME"
+          else
+            # 格式化版本号用于文件名
+            VERSION_FOR_FILENAME=$(echo "${{ needs.basic-setup.outputs.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g')
+            echo "✅ Version found: $VERSION_FOR_FILENAME"
+          fi
+          
+          # 设置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"
+          
+          # 获取版本信息（从basic-setup任务传递）
+          echo "🔍 Getting version info from basic-setup job..."
+          
+          # 设置默认版本号，如果环境变量为空
+          if [ -z "${{ needs.basic-setup.outputs.NEXT_VERSION }}" ]; then
+            VERSION_FOR_FILENAME="1-0-0"
+            echo "⚠️  Version not found, using default: $VERSION_FOR_FILENAME"
+          else
+            # 格式化版本号用于文件名
+            VERSION_FOR_FILENAME=$(echo "${{ needs.basic-setup.outputs.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g')
+            echo "✅ Version found: $VERSION_FOR_FILENAME"
+          fi
+          
+          # 设置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"
+          
+          # 获取版本信息（从basic-setup任务传递）
+          echo "🔍 Getting version info from basic-setup job..."
+          
+          # 设置默认版本号，如果环境变量为空
+          if [ -z "${{ needs.basic-setup.outputs.NEXT_VERSION }}" ]; then
+            VERSION_FOR_FILENAME="1-0-0"
+            echo "⚠️  Version not found, using default: $VERSION_FOR_FILENAME"
+          else
+            # 格式化版本号用于文件名
+            VERSION_FOR_FILENAME=$(echo "${{ needs.basic-setup.outputs.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g')
+            echo "✅ Version found: $VERSION_FOR_FILENAME"
+          fi
+          
+          # 设置IPA文件名
+          IPA_FILENAME="sky-star-lock-release-$VERSION_FOR_FILENAME.ipa"
+          echo "📁 IPA filename: $IPA_FILENAME"
+          
+          # 配置iOS自动签名（CI环境使用自动签名）
+          echo "🔧 Configuring iOS automatic code signing for CI environment..."
+          
+          # 构建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" --codesign
+          
+          # 重命名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: ${{ needs.basic-setup.outputs.NEXT_VERSION }}"
+          echo "📁 Files available in artifacts section"

README.md

@@ -61,7 +61,7 @@ keytool -list -v -keystore android/app/sky.jks
 ```
 
 输入密码（在android/app/build.gradle:38可以看到）
-
+测试ci
 一般需要的是：证书指纹-SHA1 看起来像 95:6B:***********（共59个字符）
 
 ## 编译

lan/lan_ar.json

@@ -1166,5 +1166,12 @@
   "云存会员": "عضوية التخزين السحابي",
   "服务，图像视频信息随心存！": "معلومات الخدمة والصور والفيديو في قلبك!",
   "图像": "صورة",
-  "视频": "فيديو"
+  "视频": "فيديو",
+  "当前国家不支持手机验证码注册，请使用邮箱进行注册": "حاليا ، لا تدعم الدولة تسجيل رمز التحقق من الهاتف المحمول ، يرجى استخدام عنوان بريدك الإلكتروني للتسجيل",
+  "注：": "ملاحظة:",
+  "必需在开始时间24小时内使用一次，否则将失效": "يجب استخدامه مرة واحدة خلال 24 ساعة من وقت البدء، وإلا سيصبح غير صالح",
+  "这是单次密码，只能使用一次": "هذا رمز مرور لمرة واحدة فقط، ولا يمكن استخدامه سوى مرة واحدة",
+  "您好": "مرحبًا",
+  "您的开门密码是": "رمز فتح الباب الخاص بك هو",
+  "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "عند الفتح، قم أولاً بتنشيط لوحة مفاتيح القفل، ثم أدخل الرمز وكلّمه بـ #، ويقع مفتاح # في الزاوية السفلى اليمنى من لوحة المفاتيح وقد يكون مُميّزًا برمز آخر"
 }

lan/lan_bg.json

@@ -1167,5 +1167,12 @@
     "云存会员": "Членство в Cloud Storage",
     "服务，图像视频信息随心存！": "Информацията за обслужване, изображения и видео са във вашето сърце!",
     "图像": "изображение",
-  "视频": "Видео"
+    "视频": "Видео",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "В момента страната не поддържа регистрация на код за потвърждение на мобилен телефон, моля, използвайте имейл адреса си, за да се регистрирате",
+    "注：": "примечание：",
+    "必需在开始时间24小时内使用一次，否则将失效": "Его необходимо использовать один раз в течение 24 часов с момента начала, иначе он будет недействительным.",
+    "这是单次密码，只能使用一次": "Это однократный пароль, который можно использовать только один раз.",
+    "您好": "Здравствуйте",
+    "您的开门密码是": "Ваш пароль",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "При открытии замка сначала активируйте клавиатуру замка, затем введите пароль, чтобы закончить #, # клавиша в правом нижнем углу клавиатуры, возможно, другие значки"
 }

lan/lan_bn.json

@@ -1167,5 +1167,12 @@
     "云存会员": "ক্লাউড স্টোরেজ সদস্যতা",
     "服务，图像视频信息随心存！": "পরিষেবা, চিত্র এবং ভিডিও তথ্য আপনার হৃদয়ে!",
     "图像": "প্রতিচ্ছবি",
-  "视频": "ভিডিও"
+    "视频": "ভিডিও",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "বর্তমানে, দেশটি মোবাইল ফোন যাচাইকরণ কোড নিবন্ধন সমর্থন করে না, নিবন্ধন করতে দয়া করে আপনার ইমেল ঠিকানা ব্যবহার করুন",
+    "注：": "নোট：",
+    "必需在开始时间24小时内使用一次，否则将失效": "শুরু করার সময় 24 ঘন্টার মধ্যে একবার ব্যবহার করা প্রয়োজন, অন্যথায় এটি শেষ হবে",
+    "这是单次密码，只能使用一次": "এটি একক পাসওয়ার্ড, শুধুমাত্র একবার ব্যবহার করা যায়।",
+    "您好": "হ্যালো!",
+    "您的开门密码是": "আপনার দরজা খোলার পাসওয়ার্ড",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "লক খোলার সময়, প্রথমে লক কীবোর্ড সক্রিয় করুন, তারপর পাসওয়ার্ড টাইপ করুন, যা # সংখ্যা দিয়ে শেষ হয়, # সংখ্যা কী কীবোর্ডের নিচের"
 }

lan/lan_cs.json

@@ -1167,5 +1167,12 @@
     "云存会员": "Č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",
+    "注：": "Poznámka：",
+    "必需在开始时间24小时内使用一次，否则将失效": "Je nutné použít jednou do 24 hodin od začátku, jinak vyprší.",
+    "这是单次密码，只能使用一次": "Jedná se o jednorázové heslo, které lze použít pouze jednou.",
+    "您好": "Dobrý den.",
+    "您的开门密码是": "Vaše otevírací heslo je",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Při odemknutí nejprve aktivujte klávesnici pro zamyknutí a potom zadejte heslo, které končí číslem # a číslo # je v pravém dolním rohu klávesnice, může být další ikona"
 }

lan/lan_da.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Bemærk：",
+    "必需在开始时间24小时内使用一次，否则将失效": "Bruges én gang inden for 24 timer, ellers udløber",
+    "这是单次密码，只能使用一次": "Det er en enkelt adgangskode. Du kan kun bruge den én gang.",
+    "您好": "Goddag.",
+    "您的开门密码是": "Din adgangskode er",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Når du låser op, skal du først aktivere lås tastaturet, og derefter indtaste adgangskoden, der slutter med #nummer, #nummer i nederste højre hjørne af tastaturet, der kan være andre ikoner"
 }

lan/lan_de.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Hinweis:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Muss innerhalb von 24 Stunden nach Startzeit einmal verwendet werden, sonst läuft es ab",
+    "这是单次密码，只能使用一次": "Dies ist ein Einmal-Passwort und kann nur einmal verwendet werden",
+    "您好": "Hallo",
+    "您的开门密码是": "Ihr Türöffnungscode lautet",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Zum Entriegeln zuerst die Schloss-Tastatur aktivieren, dann das Passwort eingeben und mit # beenden. Die #-Taste befindet sich in der rechten unteren Ecke der Tastatur und kann ein anderes Symbol haben"
 }

lan/lan_el.json

@@ -1167,5 +1167,12 @@
     "云存会员": "Συνδρομή Cloud Storage",
     "服务，图像视频信息随心存！": "Οι πληροφορίες εξυπηρέτησης, εικόνας και βίντεο είναι στην καρδιά σας!",
     "图像": "εικόνα",
-  "视频": "Βίντεο"
+    "视频": "Βίντεο",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Προς το παρόν, η χώρα δεν υποστηρίζει την εγγραφή κωδικού επαλήθευσης κινητού τηλεφώνου, χρησιμοποιήστε τη διεύθυνση email σας για να εγγραφείτε",
+    "注：": "Σημείωση：",
+    "必需在开始时间24小时内使用一次，否则将失效": "Πρέπει να χρησιμοποιηθεί μία φορά εντός 24 ωρών από την ώρα έναρξης, διαφορετικά θα λήξει",
+    "这是单次密码，只能使用一次": "Είναι ένας μοναδικός κωδικός πρόσβασης. Μπορεί να χρησιμοποιηθεί μόνο μία φορά.",
+    "您好": "Γεια σας.",
+    "您的开门密码是": "Ο κωδικός σας είναι",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Όταν ξεκλειδώσετε, ενεργοποιήστε το πληκτρολόγιο κλειδαριού και πληκτρολογήστε τον κωδικό πρόσβασης, ο οποίος τελειώνει με το νούμερο # και το νούμερο # είναι στην κάτω δεξιά γωνία του πληκτρολόγιου, μπορεί να είναι ένα άλλο εικονίδιο"
 }

lan/lan_en.json

@@ -1173,5 +1173,12 @@
   "云存会员": "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",
+  "注：": "Note:",
+  "必需在开始时间24小时内使用一次，否则将失效": "Must be used once within 24 hours of the start time, otherwise it will expire",
+  "这是单次密码，只能使用一次": "This is a one-time password and can only be used once",
+  "您好": "Hello",
+  "您的开门密码是": "Your door access code is",
+  "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "To unlock, first activate the lock keypad, then enter the password and end with #. The # key is located at the bottom right corner of the keypad and may have a different icon"
 }

lan/lan_es.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Nota：",
+    "必需在开始时间24小时内使用一次，否则将失效": "Debe usarse una vez dentro de las 24 horas de inicio, de lo contrario caducará.",
+    "这是单次密码，只能使用一次": "Esta es una contraseña única y solo se puede usar una vez.",
+    "您好": "Hola",
+    "您的开门密码是": "Su contraseña de apertura es",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Al abrir la cerradura, primero active el teclado de la cerradura e introduzca la contraseña para terminar con el número, la tecla de número está en la esquina inferior derecha del teclado, puede ser otro icono"
 }

lan/lan_et.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Märkus：",
+    "必需在开始时间24小时内使用一次，否则将失效": "Kasutada tuleb 24 tunni jooksul, muidu kaotab kehtivus.",
+    "这是单次密码，只能使用一次": "See on ühekordne parool, mida saab kasutada ainult üks kord.",
+    "您好": "Tere. Tere.",
+    "您的开门密码是": "Teie salasõna on",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Lukustamisel aktiveerige klaviatuur, seejärel sisestage parool, mis lõpeb numbriga # klaviatuuri paremas alumises nurgas, võib olla muud ikoonid"
 }

lan/lan_fi.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Huomautus：",
+    "必需在开始时间24小时内使用一次，否则将失效": "Käytä kerran 24 tunnin kuluessa, muuten se päättyy.",
+    "这是单次密码，只能使用一次": "Tämä on yksittäinen salasana, jota voidaan käyttää vain kerran.",
+    "您好": "Tervehdys.",
+    "您的开门密码是": "Salasanasi on",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Kun avaat lukituksen, aktivoi lukitusnäppäimistö ensin ja kirjoita salasana, joka päättyy # numerolla, # näppäimistö on näppäimistön oikeassa alakulmassa, mahdollisesti muut kuvakkeet"
 }

lan/lan_fr.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Remarque:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Doit être utilisé une fois dans les 24 heures suivant l'heure de début, sinon il expirera",
+    "这是单次密码，只能使用一次": "Ceci est un mot de passe à usage unique et ne peut être utilisé qu'une seule fois",
+    "您好": "Bonjour",
+    "您的开门密码是": "Votre code d'accès à la porte est",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Pour déverrouiller, activez d'abord le clavier du verrou, entrez ensuite le mot de passe et terminez par #. La touche # se trouve dans le coin inférieur droit du clavier et peut avoir une icône différente"
 }

lan/lan_he.json

@@ -1167,5 +1167,12 @@
     "云存会员": "חברות באחסון בענן",
     "服务，图像视频信息随心存！": "מידע על שירות, תמונה ווידאו נמצאים בלב שלך!",
     "图像": "תמונה",
-  "视频": "וידאו"
+    "视频": "וידאו",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "נכון לעכשיו, המדינה אינה תומכת ברישום קוד אימות טלפון נייד, אנא השתמש בכתובת הדוא\"ל שלך כדי להירשם",
+    "注：": "הערה:",
+    "必需在开始时间24小时内使用一次，否则将失效": "יש להשתמש בו פעם אחת בתוך 24 שעות מזמן ההתחלה, אחרת הוא יפוג",
+    "这是单次密码，只能使用一次": "זו סיסמה חד-פעמית שניתן להשתמש בה רק פעם אחת",
+    "您好": "שלום",
+    "您的开门密码是": "קוד הפתיחה שלך הוא",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "כדי לבטל את הנעילה, הפעל תחילה את מקלדת המנעול, לאחר מכן הזן את הסיסמה וסיים ב-#. המקש # נמצא בפינה הימנית התחתונה של המקלדת ועשוי להיות סמל אחר"
 }

lan/lan_hi.json

@@ -1167,5 +1167,12 @@
     "云存会员": "क्लाउड स्टोरेज सदस्यता",
     "服务，图像视频信息随心存！": "सेवा, छवि और वीडियो जानकारी आपके दिल में हैं!",
     "图像": "प्रतिबिंब",
-  "视频": "वीडियो"
+    "视频": "वीडियो",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "वर्तमान में, देश मोबाइल फोन सत्यापन कोड पंजीकरण का समर्थन नहीं करता है, कृपया पंजीकरण करने के लिए अपने ईमेल पते का उपयोग करें",
+    "注：": "नोट:",
+    "必需在开始时间24小时内使用一次，否则将失效": "आरंभ समय के 24 घंटे के भीतर एक बार उपयोग करना आवश्यक है, अन्यथा इसकी समय सीमा समाप्त हो जाएगी",
+    "这是单次密码，只能使用一次": "यह एकल उपयोग का पासवर्ड है और केवल एक बार उपयोग किया जा सकता है",
+    "您好": "नमस्ते",
+    "您的开门密码是": "आपका दरवाज़ा खोलने का कोड है",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "अनलॉक करने के लिए, पहले लॉक कीबोर्ड को सक्रिय करें, फिर पासवर्ड दर्ज करें और # के साथ समाप्त करें। # कुंजी कीबोर्ड के निचले दाएं कोने में है और इसमें कोई अन्य चिह्न हो सकता है"
 }

lan/lan_hk.json

@@ -1043,7 +1043,6 @@
     "一键开锁": "一鍵解鎖",
     "已开通": "打開",
     "英文": "English",
-    "英文": "English",
     "简体中文": "简体中文",
     "繁体中文": "繁體中文",
     "法语": "Français",
@@ -1168,5 +1167,12 @@
     "云存会员": "雲存會員",
     "服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！",
     "图像": "圖像",
-    "视频": "視頻"
+    "视频": "視頻",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "當前國家不支援手機驗證碼註冊，請使用郵箱進行註冊",
+    "注：": "註：",
+    "必需在开始时间24小时内使用一次，否则将失效": "必須在開始時間24小時內使用一次，否則將失效",
+    "这是单次密码，只能使用一次": "這是單次密碼，只能使用一次",
+    "您好": "您好",
+    "您的开门密码是": "您的開門密碼是",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "開鎖時，先啟動鎖鍵盤，再輸入密碼，以#號結束，#號鍵在鍵盤右下角，有可能是其他圖標"
 }

lan/lan_hr.json

@@ -1167,5 +1167,12 @@
     "云存会员": "Č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",
+    "注：": "Napomena:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Mora se upotrijebiti jednom unutar 24 sata od vremena početka, inače će isteći",
+    "这是单次密码，只能使用一次": "Ovo je jednokratna lozinka i može se koristiti samo jednom",
+    "您好": "Bok",
+    "您的开门密码是": "Vaša šifra za otvaranje vrata je",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Da biste otključali, prvo aktivirajte tipkovnicu brave, zatim unesite lozinku i završite s #. Tipka # nalazi se u donjem desnom kutu tipkovnice i može imati drugu ikonu"
 }

lan/lan_hu.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Megjegyzés:",
+    "必需在开始时间24小时内使用一次，否则将失效": "A kezdési időponttól számított 24 órán belül egyszer kell használni, különben lejár",
+    "这是单次密码，只能使用一次": "Ez egy egyszeri jelszó, amelyet csak egyszer lehet használni",
+    "您好": "Szia",
+    "您的开门密码是": "Az ajtónyitó kódod",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "A feloldáshoz először aktiválja a zár billentyűzetét, majd írja be a jelszót, és fejezze be a # gombbal. A # gomb a billentyűzet jobb alsó sarkában található, és más ikonnal is rendelkezhet"
 }

lan/lan_hy.json

@@ -1173,5 +1173,12 @@
     "云存会员": "Cloud Storage Membership",
     "服务，图像视频信息随心存！": "Ծառայությունը, պատկերը եւ վիդեո տեղեկատվությունը ձեր սրտում են:",
     "图像": "Պատկերասրահ",
-  "视频": "Տեսանյութ"
+    "视频": "Տեսանյութ",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Ներկայումս երկիրը չի աջակցում բջջային հեռախոսի ստուգման կոդի գրանցմանը, խնդրում ենք գրանցվելու համար օգտագործել ձեր էլ. փոստի հասցեն",
+    "注：": "Նշում՝",
+    "必需在开始时间24小时内使用一次，否则将失效": "Անհրաժեշտ է օգտագործել մեկ անգամ սկսելու ժամանակից 24 ժամվա ընթացքում, հակառակ դեպքում այն կվազվի",
+    "这是单次密码，只能使用一次": "Սա մեկ անգամյա գաղտնաբառ է եւ կարող է օգտագործվել միայն մեկ անգամ",
+    "您好": "Ողջույն",
+    "您的开门密码是": "Ձեր դռան բանալին հետեւյալն է",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Ապակողպելու համար նախ ակտիվացրեք կողպեքի ստեղնաշարը, ապա մուտքագրեք գաղտնաբառը եւ ավարտեք #-ով: #-ի ստեղնը գտնվում է ստեղնաշարի ներքեւի աջ անկյունում եւ կարող է ունենալ այլ պատկերակ"
 }

lan/lan_id.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Catatan:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Harus digunakan sekali dalam waktu 24 jam setelah waktu mulai, jika tidak akan kedaluwarsa",
+    "这是单次密码，只能使用一次": "Ini adalah kata sandi sekali pakai dan hanya bisa digunakan sekali",
+    "您好": "Halo",
+    "您的开门密码是": "Kode akses pintu Anda adalah",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Untuk membuka kunci, aktifkan keyboard kunci terlebih dahulu, lalu masukkan kata sandi dan akhiri dengan #. Tombol # berada di sudut kanan bawah keyboard dan mungkin memiliki ikon berbeda"
 }

lan/lan_it.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Nota:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Deve essere utilizzato una volta entro 24 ore dall'orario di inizio, altrimenti scadrà",
+    "这是单次密码，只能使用一次": "Questa è una password monouso e può essere utilizzata solo una volta",
+    "您好": "Ciao",
+    "您的开门密码是": "Il tuo codice di accesso alla porta è",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Per sbloccare, attiva prima la tastiera del lucchetto, quindi inserisci la password e termina con #. Il tasto # si trova nell'angolo in basso a destra della tastiera e potrebbe avere un'icona diversa"
 }

lan/lan_ja.json

@@ -1167,5 +1167,12 @@
     "云存会员": "クラウドストレージメンバーシップ",
     "服务，图像视频信息随心存！": "サービス、画像、ビデオ情報があなたの中心にあります!",
     "图像": "画像",
-  "视频": "ビデオ"
+    "视频": "ビデオ",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "現在、この国は携帯電話の認証コード登録をサポートしていませんので、メールアドレスを使用して登録してください",
+    "注：": "注：",
+    "必需在开始时间24小时内使用一次，否则将失效": "開始時刻から24時間以内に1回使用する必要があり、そうでなければ無効になります",
+    "这是单次密码，只能使用一次": "これはワンタイムパスワードで、一度だけ使用できます",
+    "您好": "こんにちは",
+    "您的开门密码是": "あなたのドアアクセスコードは",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "ロックを解除するには、まずロックキーボードをアクティブにし、次にパスワードを入力し、＃で終了します。＃キーはキーボードの右下隅にあり、別のアイコンの場合があります"
 }

lan/lan_ka.json

@@ -1173,5 +1173,12 @@
     "云存会员": "Cloud Storage წევრობა",
     "服务，图像视频信息随心存！": "მომსახურება, სურათი და ვიდეო ინფორმაცია თქვენს გულშია!",
     "图像": "სურათი",
-  "视频": "ვიდეო"
+    "视频": "ვიდეო",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "ამჟამად, ქვეყანა არ უჭერს მხარს მობილური ტელეფონის დამადასტურებელი კოდის რეგისტრაციას, გთხოვთ გამოიყენოთ თქვენი ელექტრონული ფოსტის მისამართი რეგისტრაციისთვის",
+    "注：": "შენიშვნა:",
+    "必需在开始时间24小时内使用一次，否则将失效": "უნდა გამოიყენოთ ერთხელ დაწყების დროიდან 24 საათის განმავლობაში, წინააღმდეგ შემთხვევაში ვადა გაუვა",
+    "这是单次密码，只能使用一次": "ეს არის ერთჯერადი პაროლი და შეიძლება გამოყენებულ იქნას მხოლოდ ერთხელ",
+    "您好": "გამარჯობა",
+    "您的开门密码是": "თქვენი კარის გახსნის კოდი არის",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "განბლოკვისთვის პირველ რიგში გაააქტიურეთ დამკეტის კლავიატურა, შემდეგ შეიყვანეთ პაროლი და დაასრულეთ #. # ღილაკი მდებარეობს კლავიატურის ქვედა მარჯვენა კუთხეში და შეიძლება ჰქონდეს სხვა ხატულა"
 }

lan/lan_keys.json

@@ -1178,5 +1178,12 @@
   "云存会员": "云存会员",
   "服务，图像视频信息随心存！": "服务，图像视频信息随心存！",
   "图像": "图像",
-  "视频": "视频"
+  "视频": "视频",
+  "当前国家不支持手机验证码注册，请使用邮箱进行注册": "当前国家不支持手机验证码注册，请使用邮箱进行注册",
+  "注：":"注：",
+  "必需在开始时间24小时内使用一次，否则将失效": "必需在开始时间24小时内使用一次，否则将失效",
+  "这是单次密码，只能使用一次": "这是单次密码，只能使用一次",
+  "您好": "您好",
+  "您的开门密码是": "您的开门密码是",
+  "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标"
 }

lan/lan_kk.json

@@ -1167,5 +1167,12 @@
     "云存会员": "Бұлтты сақтауға мүшелік",
     "服务，图像视频信息随心存！": "Қызмет, бейне және бейне ақпарат сіздің жүрегіңізде жатыр!",
     "图像": "кескіні",
-  "视频": "Бейне"
+    "视频": "Бейне",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Қазіргі уақытта елде ұялы телефонды растау кодын тіркеуді қолдамайды, тіркелу үшін электрондық пошта мекенжайыңызды пайдаланыңыз",
+    "注：": "Ескерту:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Бастау уақытынан бастап 24 сағат ішінде бір рет қолдану керек, әйтпесе мерзімі аяқталады",
+    "这是单次密码，只能使用一次": "Бұл бір реттік құпиясөз, оны тек бір рет қолдануға болады",
+    "您好": "Сәлеметсіз бе",
+    "您的开门密码是": "Есікті ашу кодыңыз",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Құлыпты ашу үшін алдымен құлып пернетақтасын іске қосыңыз, содан кейін құпиясөзді енгізіп, # арқылы аяқтаңыз. # пернесі пернетақтаның төменгі оң жақ бұрышында орналасқан және басқа белгі болуы мүмкін"
 }

lan/lan_ko.json

@@ -1167,5 +1167,12 @@
     "云存会员": "클라우드 스토리지 멤버십",
     "服务，图像视频信息随心存！": "서비스, 이미지 및 비디오 정보가 당신의 중심에 있습니다!",
     "图像": "이미지",
-  "视频": "비디오"
+    "视频": "비디오",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "현재 해당 국가는 휴대폰 인증코드 등록을 지원하지 않으니 이메일 주소를 사용하여 등록하세요.",
+    "注：": "참고:",
+    "必需在开始时间24小时内使用一次，否则将失效": "시작 시간으로부터 24시간 이내에 한 번 사용해야 하며, 그렇지 않으면 만료됩니다.",
+    "这是单次密码，只能使用一次": "이것은 일회용 비밀번호로 한 번만 사용할 수 있습니다.",
+    "您好": "안녕하세요",
+    "您的开门密码是": "귀하의 문 열기 코드는",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "잠금을 해제하려면 먼저 잠금 키보드를 활성화한 다음 비밀번호를 입력하고 #로 끝냅니다. # 키는 키보드의 오른쪽 하단 모서리에 있으며 다른 아이콘일 수 있습니다."
 }

lan/lan_lt.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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ą",
+    "注：": "Pastaba:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Turi būti naudojamas vieną kartą per 24 valandas nuo pradžios laiko, kitaip jis baigs galioti",
+    "这是单次密码，只能使用一次": "Tai vienkartinis slaptažodis, kurį galima naudoti tik vieną kartą",
+    "您好": "Sveiki",
+    "您的开门密码是": "Jūsų durų atidarymo kodas yra",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Norėdami atrakinti, pirmiausia suaktyvinkite užrakto klaviatūrą, tada įveskite slaptažodį ir baikite #. Klavišas # yra klaviatūros apatiniame dešiniajame kampe ir gali būti kita piktograma"
 }

lan/lan_ms.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Nota:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Mesti digunakan sekali dalam masa 24 jam dari masa mula, jika tidak ia akan luput",
+    "这是单次密码，只能使用一次": "Ini ialah kata laluan sekali guna dan hanya boleh digunakan sekali",
+    "您好": "Helo",
+    "您的开门密码是": "Kod akses pintu anda ialah",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Untuk membuka kunci, aktifkan papan kekunci kunci terlebih dahulu, kemudian masukkan kata laluan dan tamatkan dengan #. Kekunci # berada di sudut kanan bawah papan kekunci dan mungkin mempunyai ikon lain"
 }

lan/lan_nl.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Opmerking:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Moet één keer worden gebruikt binnen 24 uur na de starttijd, anders verloopt het",
+    "这是单次密码，只能使用一次": "Dit is een eenmalig wachtwoord en kan maar één keer worden gebruikt",
+    "您好": "Hallo",
+    "您的开门密码是": "Uw deurtoegangscode is",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Om te ontgrendelen, activeert u eerst het toetsenbord van het slot, voert u vervolgens het wachtwoord in en eindigt u met #. De #-toets bevindt zich in de rechterbenedenhoek van het toetsenbord en kan een ander pictogram hebben"
 }

lan/lan_pl.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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ć",
+    "注：": "Uwaga:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Należy użyć raz w ciągu 24 godzin od czasu rozpoczęcia, w przeciwnym razie wygaśnie",
+    "这是单次密码，只能使用一次": "To hasło jednorazowe, którego można użyć tylko raz",
+    "您好": "Cześć",
+    "您的开门密码是": "Twój kod dostępu do drzwi to",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Aby odblokować, najpierw aktywuj klawiaturę zamka, następnie wprowadź hasło i zakończ #. Klawisz # znajduje się w prawym dolnym rogu klawiatury i może mieć inną ikonę"
 }

lan/lan_pt.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Nota:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Deve ser usado uma vez dentro de 24 horas após o horário de início, caso contrário expirará",
+    "这是单次密码，只能使用一次": "Esta é uma senha de uso único e só pode ser usada uma vez",
+    "您好": "Olá",
+    "您的开门密码是": "Seu código de acesso à porta é",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Para desbloquear, primeiro ative o teclado do cadeado e depois digite a senha terminando com #. A tecla # está no canto inferior direito do teclado e pode ter um ícone diferente"
 }

lan/lan_pt_br.json

@@ -1172,5 +1172,12 @@
     "云存会员": "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",
+    "注：": "Nota:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Deve ser usado uma vez dentro de 24 horas após o horário de início, caso contrário expirará",
+    "这是单次密码，只能使用一次": "Esta é uma senha de uso único e só pode ser usada uma vez",
+    "您好": "Olá",
+    "您的开门密码是": "Seu código de acesso à porta é",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Para desbloquear, primeiro ative o teclado do cadeado e depois digite a senha terminando com #. A tecla # está no canto inferior direito do teclado e pode ter um ícone diferente"
 }

lan/lan_ro.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Notă:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Trebuie folosit o dată în termen de 24 de ore de la ora de început, altfel va expira",
+    "这是单次密码，只能使用一次": "Aceasta este o parolă unică și poate fi folosită doar o dată",
+    "您好": "Bună",
+    "您的开门密码是": "Codul dvs. de acces la ușă este",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Pentru a debloca, activați mai întâi tastatura lacătului, apoi introduceți parola și terminați cu #. Tasta # se află în colțul din dreapta jos al tastaturii și poate avea o altă pictogramă"
 }

lan/lan_ru.json

@@ -1171,5 +1171,12 @@
     "云存会员": "Членство в облачном хранилище",
     "服务，图像视频信息随心存！": "Сервисная, имиджевая и видеоинформация в Вашем сердце!",
     "图像": "образ",
-  "视频": "Видео"
+    "视频": "Видео",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "В настоящее время страна не поддерживает регистрацию кода верификации мобильного телефона, пожалуйста, используйте свой адрес электронной почты для регистрации",
+    "注：": "Примечание:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Должен быть использован один раз в течение 24 часов с момента начала, иначе он истечет",
+    "这是单次密码，只能使用一次": "Это одноразовый пароль, который можно использовать только один раз",
+    "您好": "Привет!",
+    "您的开门密码是": "Ваш код доступа к двери",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Чтобы разблокировать, сначала активируйте клавиатуру замка, затем введите пароль и закончите #. Клавиша # находится в правом нижнем углу клавиатуры и может иметь другой значок"
 }

lan/lan_sk.json

@@ -1167,5 +1167,12 @@
     "云存会员": "Č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",
+    "注：": "Poznámka:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Musí byť použitý raz do 24 hodín od počiatočného času, inak vyprší",
+    "这是单次密码，只能使用一次": "Toto je jednorazové heslo, ktoré možno použiť iba raz",
+    "您好": "Ahoj",
+    "您的开门密码是": "Váš prístupový kód do dverí je",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Ak chcete odomknúť, najprv aktivujte klávesnicu zámku, potom zadajte heslo a ukončite #. Kľúč # je v pravom dolnom rohu klávesnice a môže mať inú ikonu"
 }

lan/lan_sr_cyrl.json

@@ -1167,5 +1167,12 @@
     "云存会员": "Чланство у облаку за складиштење",
     "服务，图像视频信息随心存！": "Сервис , слике и видео информације су у вашем срцу!",
     "图像": "Слика",
-    "视频": "Пријава"
+    "视频": "Пријава",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Тренутно , земља не подржава регистрацију кода за верификацију мобилног телефона, молимо вас да користите своју адресу е-поште за регистрацију",
+    "注：": "Напомена:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Мора се користити једном у року од 24 сата од времена почетка, иначе истиче",
+    "这是单次密码，只能使用一次": "Ово је једнократна лозинка која се може користити само једном",
+    "您好": "Здраво",
+    "您的开门密码是": "Ваш код за отварање врата је",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Да бисте откључали, прво активирајте тастатуру браве, затим унесите лозинку и завршите са #. Тастер # се налази у доњем десном углу тастатуре и може имати другу икону"
 }

lan/lan_sv.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Obs:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Måste användas en gång inom 24 timmar efter starttiden, annars löper den ut",
+    "这是单次密码，只能使用一次": "Detta är ett engångslösenord och kan endast användas en gång",
+    "您好": "Hej",
+    "您的开门密码是": "Din dörröppningskod är",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "För att låsa upp, aktivera först låsens tangentbord, ange sedan lösenordet och avsluta med #. #-tangenten finns i det nedre högra hörnet av tangentbordet och kan ha en annan ikon"
 }

lan/lan_th.json

@@ -1167,5 +1167,12 @@
     "云存会员": "สมาชิกที่เก็บข้อมูลบนคลาวด์",
     "服务，图像视频信息随心存！": "ข้อมูลบริการ รูปภาพ และวิดีโออยู่ที่หัวใจของคุณ!",
     "图像": "ภาพ",
-  "视频": "วีดิทัศน์"
+    "视频": "วีดิทัศน์",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "ปัจจุบันประเทศไม่รองรับการลงทะเบียนรหัสยืนยันโทรศัพท์มือถือ โปรดใช้ที่อยู่อีเมลของคุณในการลงทะเบียน",
+    "注：": "หมายเหตุ:",
+    "必需在开始时间24小时内使用一次，否则将失效": "ต้องใช้ภายใน 24 ชั่วโมงหลังจากเวลาเริ่มต้น มิฉะนั้นจะหมดอายุ",
+    "这是单次密码，只能使用一次": "นี่คือรหัสผ่านแบบใช้ครั้งเดียวและสามารถใช้ได้เพียงครั้งเดียวเท่านั้น",
+    "您好": "สวัสดี",
+    "您的开门密码是": "รหัสการเข้าถึงประตูของคุณคือ",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "ในการปลดล็อค ให้เปิดใช้งานแป้นพิมพ์ล็อคก่อน จากนั้นป้อนรหัสผ่านและจบด้วย # ปุ่ม # อยู่ที่มุมล่างขวาของแป้นพิมพ์และอาจมีไอคอนอื่น"
 }

lan/lan_tr.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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",
+    "注：": "Not:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Başlangıç zamanından itibaren 24 saat içinde bir kez kullanılmalıdır, aksi takdirde süresi dolacaktır",
+    "这是单次密码，只能使用一次": "Bu tek kullanımlık bir şifredir ve yalnızca bir kez kullanılabilir",
+    "您好": "Merhaba",
+    "您的开门密码是": "Kapı erişim kodunuz",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Kilidi açmak için önce kilit klavyesini etkinleştirin, ardından şifreyi girin ve # ile bitirin. # tuşu klavyenin sağ alt köşesindedir ve farklı bir simge olabilir"
 }

lan/lan_tw.json

@@ -1167,5 +1167,12 @@
     "云存会员": "雲存會員",
     "服务，图像视频信息随心存！": "服務，圖像視頻資訊隨心存！",
     "图像": "圖像",
-    "视频": "視頻"
+    "视频": "視頻",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "當前國家不支援手機驗證碼註冊，請使用郵箱進行註冊",
+    "注：": "註：",
+    "必需在开始时间24小时内使用一次，否则将失效": "必須在開始時間24小時內使用一次，否則將失效",
+    "这是单次密码，只能使用一次": "這是單次密碼，只能使用一次",
+    "您好": "您好",
+    "您的开门密码是": "您的開門密碼是",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "開鎖時，先啟動鎖鍵盤，再輸入密碼，以#號結束，#號鍵在鍵盤右下角，有可能是其他圖標"
 }

lan/lan_uk.json

@@ -1167,5 +1167,12 @@
     "云存会员": "Членство в хмарних сховищах",
     "服务，图像视频信息随心存！": "Сервіс, зображення та відео інформація у вашому серці!",
     "图像": "образ",
-  "视频": "Відео"
+    "视频": "Відео",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "Наразі країна не підтримує реєстрацію коду підтвердження на мобільному телефоні, будь ласка, використовуйте свою адресу електронної пошти для реєстрації",
+    "注：": "Примітка:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Потрібно використати один раз протягом 24 годин після початкового часу, інакше термін дії спливе",
+    "这是单次密码，只能使用一次": "Це одноразовий пароль, який можна використовувати лише один раз",
+    "您好": "Привіт",
+    "您的开门密码是": "Ваш код доступу до дверей",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Щоб розблокувати, спочатку активуйте клавіатуру замка, потім введіть пароль і закінчіть #. Клавіша # знаходиться в правому нижньому куті клавіатури та може мати інший значок"
 }

lan/lan_ur.json

@@ -1167,5 +1167,12 @@
     "云存会员": "Cloud Storage Membership",
     "服务，图像视频信息随心存！": "خدمت، تصویر اور ویڈیو کی معلومات آپ کے دل میں ہیں!",
     "图像": "روپ",
-  "视频": "ویڈیو"
+    "视频": "ویڈیو",
+    "当前国家不支持手机验证码注册，请使用邮箱进行注册": "فی الحال، ملک موبائل فون کی توثیقی کوڈ رجسٹریشن کی حمایت نہیں کرتا ہے، براہ کرم رجسٹر کرنے کے لئے اپنا ای میل ایڈریس استعمال کریں",
+    "注：": "نوٹ:",
+    "必需在开始时间24小时内使用一次，否则将失效": "وقت آغاز سے 24 گھنٹوں کے اندر ایک بار استعمال کرنا ضروری ہے، ورنہ اس کی میعاد ختم ہو جائے گی",
+    "这是单次密码，只能使用一次": "یہ ایک بار کا پاس ورڈ ہے اور صرف ایک بار استعمال کیا جا سکتا ہے",
+    "您好": "ہیلو",
+    "您的开门密码是": "آپ کا دروازہ کھولنے کا کوڈ ہے",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "غیر مقفل کرنے کے لئے، پہلے لاک کی بورڈ کو چالو کریں، پھر پاس ورڈ درج کریں اور # کے ساتھ ختم کریں۔ # کلید کی بورڈ کے دائیں نچلے کونے میں ہے اور اس میں کوئی اور آئیکن ہو سکتی ہے"
 }

lan/lan_vi.json

@@ -1167,5 +1167,12 @@
     "云存会员": "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ý",
+    "注：": "Lưu ý:",
+    "必需在开始时间24小时内使用一次，否则将失效": "Phải được sử dụng một lần trong vòng 24 giờ kể từ thời điểm bắt đầu, nếu không sẽ hết hạn",
+    "这是单次密码，只能使用一次": "Đây là mật khẩu một lần và chỉ có thể sử dụng một lần",
+    "您好": "Xin chào",
+    "您的开门密码是": "Mã truy cập cửa của bạn là",
+    "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "Để mở khóa, trước tiên hãy kích hoạt bàn phím khóa, sau đó nhập mật khẩu và kết thúc bằng #. Phím # nằm ở góc dưới bên phải của bàn phím và có thể có biểu tượng khác"
 }

lan/lan_zh.json

@@ -1179,5 +1179,12 @@
   "云存会员": "云存会员",
   "服务，图像视频信息随心存！": "服务，图像视频信息随心存！",
   "图像": "图像",
-  "视频": "视频"
+  "视频": "视频",
+  "当前国家不支持手机验证码注册，请使用邮箱进行注册": "当前国家不支持手机验证码注册，请使用邮箱进行注册",
+  "注：":"注：",
+  "必需在开始时间24小时内使用一次，否则将失效": "必需在开始时间24小时内使用一次，否则将失效",
+  "这是单次密码，只能使用一次": "这是单次密码，只能使用一次",
+  "您好": "您好",
+  "您的开门密码是": "您的开门密码是",
+  "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标": "开锁时，先激活锁键盘，再输入密码，以#号结束，#号键在键盘右下角，有可能是其他图标"
 }

lib/apm/umeng/umeng_helper.dart

@@ -1,5 +1,5 @@
 //<cn>
-import 'package:umeng_common_sdk/umeng_common_sdk.dart';
+// import 'package:umeng_common_sdk/umeng_common_sdk.dart';
 import '../../flavors.dart';
 
 class UmengHelper {
@@ -15,27 +15,24 @@ class UmengHelper {
     return _instance!;
   }
 
-  Future<void> initApp() async {
+  Future<void> initApp() async {}
-
-  }
 
   Future<void> initSdk() async {
-    UmengCommonSdk.initCommon(
+    // UmengCommonSdk.initCommon(
-        F.umengKey.androidKey, F.umengKey.iosKey, F.umengKey.channel);
+    //     F.umengKey.androidKey, F.umengKey.iosKey, F.umengKey.channel);
-    UmengCommonSdk.setPageCollectionModeManual();
+    // UmengCommonSdk.setPageCollectionModeManual();
   }
 
   Future<void> login(String userId) async {
-    UmengCommonSdk.onProfileSignIn(userId);
+    // UmengCommonSdk.onProfileSignIn(userId);
   }
 
-  Future<void> trackEvent(
+  Future<void> trackEvent(String eventName, Map<String, Object> parameters) async {
-      String eventName, Map<String, Object> parameters) async {
+    // UmengCommonSdk.onEvent(eventName, parameters);
-    UmengCommonSdk.onEvent(eventName, parameters);
   }
 
   Future<void> logout() async {
-    UmengCommonSdk.onProfileSignOff();
+    // UmengCommonSdk.onProfileSignOff();
   }
 }
 //</cn>

lib/appRouters.dart

@@ -18,6 +18,7 @@ import 'package:star_lock/main/lockDetail/iris/addIris/addIris_page.dart';
 import 'package:star_lock/main/lockDetail/iris/addIrisType/addIrisTypeManage/addIrisTypeManage_page.dart';
 import 'package:star_lock/main/lockDetail/iris/irisList/irisList_page.dart';
 import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_main_page.dart';
+import 'package:star_lock/main/lockDetail/lockSet/aiAssistant/ai_assistant_page.dart';
 import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart';
 import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart';
 import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_page.dart';
@@ -532,6 +533,7 @@ abstract class Routers {
   static const String permissionGuidancePage =
       '/permissionGuidancePage'; // 锁屏权限通知引导页面
   static const String lockVoiceSettingPage = '/lockVoiceSetting'; // 锁屏权限通知引导页面
+  static const String aiAssistant = '/aiAssistant';
 }
 
 abstract class AppRouters {
@@ -1224,6 +1226,9 @@ abstract class AppRouters {
     GetPage<dynamic>(
         name: Routers.thirdPartyPlatformPage,
         page: () => ThirdPartyPlatformPage()),
+    GetPage<dynamic>(
+        name: Routers.aiAssistant,
+        page: () => AiAssistantPage()),
     // 插件播放页面
     // GetPage<dynamic>(name: Routers.h264View, page: () => H264WebView()), // webview播放页面
   ];

lib/blue/blue_manage.dart

@@ -16,8 +16,7 @@ import 'io_type.dart';
 import 'reciver_data.dart';
 
 //连接状态回调
-typedef ConnectStateCallBack = Function(
+typedef ConnectStateCallBack = Function(BluetoothConnectionState connectionState);
-    BluetoothConnectionState connectionState);
 typedef ScanDevicesCallBack = Function(List<ScanResult>);
 
 class BlueManage {
@@ -47,7 +46,7 @@ class BlueManage {
   StreamSubscription<BluetoothConnectionState>? _connectionStateSubscription;
 
   StreamSubscription<int>? _mtuSubscription;
-  int? _mtuSize = 20;
+  int? _mtuSize = 30;
 
   // 当前连接设备的名字
   String connectDeviceName = '';
@@ -62,8 +61,7 @@ class BlueManage {
   ScanResult? scanResult;
 
   // 监听蓝牙连接状态
-  BluetoothConnectionState? bluetoothConnectionState =
+  BluetoothConnectionState? bluetoothConnectionState = BluetoothConnectionState.disconnected;
-      BluetoothConnectionState.disconnected;
 
   BluetoothAdapterState? _adapterState = BluetoothAdapterState.on;
   StreamSubscription<BluetoothAdapterState>? _adapterStateStateSubscription;
@@ -111,8 +109,7 @@ class BlueManage {
   }
 
   void _initAdapterStateStateSubscription() {
-    _adapterStateStateSubscription ??=
+    _adapterStateStateSubscription ??= FlutterBluePlus.adapterState.listen((BluetoothAdapterState state) {
-        FlutterBluePlus.adapterState.listen((BluetoothAdapterState state) {
       AppLog.log('蓝牙状态:$state');
       _adapterState = state;
     });
@@ -122,18 +119,14 @@ class BlueManage {
     _connectionStateSubscription?.cancel();
     _connectionStateSubscription = null;
 
-    _connectionStateSubscription = bluetoothConnectDevice!.connectionState
+    _connectionStateSubscription = bluetoothConnectDevice!.connectionState.listen((BluetoothConnectionState state) async {
-        .listen((BluetoothConnectionState state) async {
       bluetoothConnectionState = state;
       AppLog.log('蓝牙连接回调状态:$state');
     });
   }
 
   void _initSendStreamSubscription() {
-    _sendStreamSubscription ??= EventBusManager()
+    _sendStreamSubscription ??= EventBusManager().eventBus!.on<EventSendModel>().listen((EventSendModel model) {
-        .eventBus!
-        .on<EventSendModel>()
-        .listen((EventSendModel model) {
       AppLog.log('eventBus接收发送数据:${model}');
       if (model.sendChannel == DataChannel.ble) {
         FlutterBluePlus.isSupported.then((bool isAvailable) async {
@@ -158,39 +151,27 @@ class BlueManage {
   }
 
   /// 开始指定设备名称的扫描蓝牙设备
-  Future<void> startScanSingle(String deviceName, int timeout,
+  Future<void> startScanSingle(String deviceName, int timeout, ScanDevicesCallBack scanDevicesCallBack) async {
-      ScanDevicesCallBack scanDevicesCallBack) async {
     final DateTime start = DateTime.now();
     FlutterBluePlus.isSupported.then((bool isAvailable) async {
       if (isAvailable) {
         // AppLog.log('startScanSingle 蓝牙状态 系统蓝牙状态：$_adapterState 蓝牙连接状态：$bluetoothConnectionState');
         if (_adapterState == BluetoothAdapterState.on) {
           try {
-            BuglyTool.uploadException(
+            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(
-                continuousDivisor: divisor,
+                continuousDivisor: divisor, continuousUpdates: true, withKeywords: <String>[deviceName], timeout: Duration(seconds: timeout));
-                continuousUpdates: true,
-                withKeywords: <String>[deviceName],
-                timeout: Duration(seconds: timeout));
             final Completer<dynamic> completer = Completer<dynamic>();
-            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
-              final bool isExit = results.any((ScanResult element) =>
+                  .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(
                   message: '指定设备名称的扫描蓝牙设备 监听扫描结果',
-                  detail:
+                  detail: 'startScanSingle$deviceName 监听扫描结果 是否查找到 $isExit 以查找$milliseconds毫秒 扫描到的设备数:${results.length} results:$results',
-                      'startScanSingle$deviceName 监听扫描结果 是否查找到 $isExit 以查找$milliseconds毫秒 扫描到的设备数:${results.length} results:$results',
                   upload: false);
               if (isExit) {
                 for (final ScanResult scanResult in results) {
@@ -202,20 +183,15 @@ class BlueManage {
                   }
 
                   final isMatch = _isMatch(
-                    scanResult.advertisementData.serviceUuids
+                    scanResult.advertisementData.serviceUuids.map((e) => e.uuid).toList(),
-                        .map((e) => e.uuid)
-                        .toList(),
                     isSingle: true,
                   );
 
                   if (isMatch && (scanResult.rssi >= -100)) {
                     // 查询id相同的元素
-                    final int knownDeviceIndex = scanDevices.indexWhere(
+                    final int knownDeviceIndex = scanDevices.indexWhere((ScanResult d) =>
-                        (ScanResult d) =>
+                        (d.device.platformName == scanResult.device.platformName) ||
-                            (d.device.platformName ==
+                        (d.advertisementData.advName == scanResult.advertisementData.advName));
-                                scanResult.device.platformName) ||
-                            (d.advertisementData.advName ==
-                                scanResult.advertisementData.advName));
                     // 不存在的时候返回-1
                     if (knownDeviceIndex >= 0) {
                       scanDevices[knownDeviceIndex] = scanResult;
@@ -224,8 +200,7 @@ class BlueManage {
                     }
                     BuglyTool.uploadException(
                         message: '遍历扫描到的结果跟缓存的结果对比，如果有最新的就更新缓存',
-                        detail:
+                        detail: 'startScanSingle deviceName:$deviceName 查询到的结果scanResult:$scanResult',
-                            'startScanSingle deviceName:$deviceName 查询到的结果scanResult:$scanResult',
                         upload: false);
                   }
                 }
@@ -233,10 +208,7 @@ class BlueManage {
                 completer.complete();
               }
             }, onError: (e) {
-              BuglyTool.uploadException(
+              BuglyTool.uploadException(message: '指定设备名称的扫描蓝牙设备 监听扫描结果失败', detail: '打印失败问题 e：${e.toString()}', upload: false);
-                  message: '指定设备名称的扫描蓝牙设备 监听扫描结果失败',
-                  detail: '打印失败问题 e：${e.toString()}',
-                  upload: false);
               AppLog.log('扫描失败:$e');
             });
             FlutterBluePlus.cancelWhenScanComplete(subscription);
@@ -244,10 +216,7 @@ class BlueManage {
             scanDevicesCallBack(scanDevices);
             subscription.cancel();
           } catch (e) {
-            BuglyTool.uploadException(
+            BuglyTool.uploadException(message: '指定设备名称的扫描蓝牙设备 内部逻辑整形失败', detail: 'tartScanSingle内部逻辑整形失败 e:${e.toString()}', upload: false);
-                message: '指定设备名称的扫描蓝牙设备 内部逻辑整形失败',
-                detail: 'tartScanSingle内部逻辑整形失败 e:${e.toString()}',
-                upload: false);
             AppLog.log('扫描失败');
           }
         } else {
@@ -264,17 +233,14 @@ class BlueManage {
   }
 
   /// 开始扫描蓝牙设备
-  Future<void> startScan(int timeout, DeviceType deviceType,
+  Future<void> startScan(int timeout, DeviceType deviceType, ScanDevicesCallBack scanDevicesCallBack, {List<Guid>? idList}) async {
-      ScanDevicesCallBack scanDevicesCallBack,
-      {List<Guid>? 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));
-            final StreamSubscription<List<ScanResult>> subscription =
+            final StreamSubscription<List<ScanResult>> subscription = FlutterBluePlus.scanResults.listen((List<ScanResult> results) {
-                FlutterBluePlus.scanResults.listen((List<ScanResult> results) {
               scanDevices.clear();
               for (final ScanResult scanResult in results) {
                 if (scanResult.advertisementData.serviceUuids.isNotEmpty) {
@@ -285,21 +251,16 @@ class BlueManage {
                 }
 
                 final isMatch = _isMatch(
-                  scanResult.advertisementData.serviceUuids
+                  scanResult.advertisementData.serviceUuids.map((e) => e.uuid).toList(),
-                      .map((e) => e.uuid)
-                      .toList(),
                   deviceType: deviceType,
                   isSingle: false,
                 );
                 // 判断名字为空的直接剔除
                 if (isMatch && (scanResult.rssi >= -100)) {
                   // 查询id相同的元素
-                  final int knownDeviceIndex = scanDevices.indexWhere(
+                  final int knownDeviceIndex = scanDevices.indexWhere((ScanResult d) =>
-                      (ScanResult d) =>
+                      (d.device.platformName == scanResult.device.platformName) ||
-                          (d.device.platformName ==
+                      (d.advertisementData.advName == scanResult.advertisementData.advName));
-                              scanResult.device.platformName) ||
-                          (d.advertisementData.advName ==
-                              scanResult.advertisementData.advName));
                   // 不存在的时候返回-1
                   if (knownDeviceIndex >= 0) {
                     scanDevices[knownDeviceIndex] = scanResult;
@@ -333,10 +294,8 @@ class BlueManage {
   }
 
   /// 判断是否包含指定的uuid
-  bool _isMatch(List<String> serviceUuids,
+  bool _isMatch(List<String> serviceUuids, {DeviceType deviceType = DeviceType.blue, required bool isSingle}) {
-      {DeviceType deviceType = DeviceType.blue, required bool isSingle}) {
+    final List<String> prefixes = getDeviceType(deviceType).map((e) => e.toLowerCase()).toList();
-    final List<String> prefixes =
-        getDeviceType(deviceType).map((e) => e.toLowerCase()).toList();
     for (String uuid in serviceUuids) {
       final String cleanUuid = uuid.toLowerCase();
       if (cleanUuid.length == 8) {
@@ -367,8 +326,7 @@ class BlueManage {
                 } else {
                   // 判断配对状态（带横杠UUID的第31、32位，从1开始计数）
                   if (cleanUuid.length >= 32) {
-                    String pairStatus =
+                    String pairStatus = cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
-                        cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
                     // 00=未配对，01=已配对
                     if (pairStatus == '00') {
                       return true; // 未配对才返回true
@@ -386,12 +344,11 @@ class BlueManage {
 
                       // 判断是否有新事件
                       bool hasNewEvent = (byte1 == 1);
-
                       // 返回是否未配对（原逻辑）
-                      if (isPaired) {
+                      if (!isPaired) {
-                        return true; // 已配对返回false
+                        return true; // 未配对返回true
                       } else {
-                        return false; // 未配对返回true
+                        return false; // 配对返回false
                       }
                     }
                     // 已配对（01）不返回true，继续判断下一个uuid
@@ -408,8 +365,7 @@ class BlueManage {
                 } else {
                   // 判断配对状态（带横杠UUID的第31、32位，从1开始计数）
                   if (cleanUuid.length >= 32) {
-                    String pairStatus =
+                    String pairStatus = cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
-                        cleanUuid.substring(30, 32); // 第31、32位（从1开始计数）
                     // 00=未配对，01=已配对
                     if (pairStatus == '00') {
                       return true; // 未配对才返回true
@@ -428,8 +384,10 @@ class BlueManage {
 
   /// 调用发送数据 List senderData,
   Future<void> blueSendData(
-      String deviceName, ConnectStateCallBack stateCallBack,
+    String deviceName,
-      {bool isAddEquipment = false}) async {
+    ConnectStateCallBack stateCallBack, {
+    bool isAddEquipment = false,
+  }) async {
     FlutterBluePlus.isSupported.then((bool isAvailable) async {
       if (isAvailable) {
         // AppLog.log('蓝牙状态 系统蓝牙状态：$_adapterState 蓝牙连接状态：$bluetoothConnectionState');
@@ -438,26 +396,26 @@ class BlueManage {
           if (bluetoothConnectionState != BluetoothConnectionState.connected) {
             BuglyTool.uploadException(
                 message: '点击按钮 蓝牙未连接 下一步扫描连接蓝牙',
-                detail:
+                detail: 'blueSendData 蓝牙连接状态 bluetoothConnectionState：$bluetoothConnectionState deviceName:$deviceName',
-                    'blueSendData 蓝牙连接状态 bluetoothConnectionState：$bluetoothConnectionState deviceName:$deviceName',
                 upload: false);
-            _connect(deviceName, (BluetoothConnectionState state) {
+            // 连接设备
+            _connect(
+              deviceName,
+              (BluetoothConnectionState state) {
                 stateCallBack(bluetoothConnectionState!);
-            }, isAddEquipment: isAddEquipment);
+              },
+              isAddEquipment: isAddEquipment,
+            );
           } else {
             BuglyTool.uploadException(
                 message: '点击按钮 蓝牙已经连接 下一步扫描连接蓝牙',
-                detail:
+                detail: 'blueSendData 直接回调状态 蓝牙连接状态bluetoothConnectionState：$bluetoothConnectionState deviceName:$deviceName',
-                    'blueSendData 直接回调状态 蓝牙连接状态bluetoothConnectionState：$bluetoothConnectionState deviceName:$deviceName',
                 upload: false);
             stateCallBack(bluetoothConnectionState!);
           }
         } else {
           BuglyTool.uploadException(
-              message: '点击按钮 蓝牙未打开',
+              message: '点击按钮 蓝牙未打开', detail: 'blueSendData 蓝牙未打开--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName', upload: false);
-              detail:
-                  'blueSendData 蓝牙未打开--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName',
-              upload: false);
           try {
             stateCallBack(BluetoothConnectionState.disconnected);
             openBlue();
@@ -465,16 +423,12 @@ class BlueManage {
             AppLog.log('蓝牙打开失败');
             BuglyTool.uploadException(
                 message: '点击按钮 蓝牙未打开 然后蓝牙打开失败',
-                detail:
+                detail: 'blueSendData 蓝牙打开失败--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName',
-                    'blueSendData 蓝牙打开失败--_adapterState:${BluetoothAdapterState.on} deviceName:$deviceName',
                 upload: false);
           }
         }
       } else {
-        BuglyTool.uploadException(
+        BuglyTool.uploadException(message: '点击按钮 蓝牙状态不可用', detail: 'blueSendData 蓝牙状态不可用--isAvailable:$isAvailable', upload: false);
-            message: '点击按钮 蓝牙状态不可用',
-            detail: 'blueSendData 蓝牙状态不可用--isAvailable:$isAvailable',
-            upload: false);
         stateCallBack(BluetoothConnectionState.disconnected);
         AppLog.log('开始扫描 蓝牙不可用，不能进行蓝牙操作');
       }
@@ -482,25 +436,19 @@ class BlueManage {
   }
 
   /// 连接
-  Future<void> _connect(
+  Future<void> _connect(String deviceName, ConnectStateCallBack connectStateCallBack, {bool isAddEquipment = false}) async {
-      String deviceName, ConnectStateCallBack connectStateCallBack,
-      {bool isAddEquipment = false}) async {
     connectDeviceName = deviceName;
     // 当前已扫描到的缓存设备
     final List<ScanResult> devicesList = scanDevices;
     // 是否有缓存设备 true是有缓存设备
     final bool isExistDevice = isExistScanDevices(connectDeviceName);
     // 是否是当前设备
-    final bool isCurrentDevice =
+    final bool isCurrentDevice = CommonDataManage().currentKeyInfo.lockName == deviceName;
-        CommonDataManage().currentKeyInfo.lockName == deviceName;
     // mac地址
     final String? mac = CommonDataManage().currentKeyInfo.mac;
 
     AppLog.log('开始连接 是否存在缓存：$isExistDevice 是否是当前设备：$isCurrentDevice  mac：$mac');
-    if (GetPlatform.isAndroid &&
+    if (GetPlatform.isAndroid && !isExistDevice && isCurrentDevice && mac != null) {
-        !isExistDevice &&
-        isCurrentDevice &&
-        mac != null) {
       // 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空
       BuglyTool.uploadException(
           message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
@@ -512,22 +460,17 @@ class BlueManage {
       try {
         if (!needScanSingle) {
           BuglyTool.uploadException(
-              message:
+              message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
-                  '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
               detail: '调用方法doNotSearchBLE，直接连接,needScanSingle：$needScanSingle',
               upload: false);
-          await doNotSearchBLE(mac, connectStateCallBack,
+          await doNotSearchBLE(mac, connectStateCallBack, isAddEquipment: isAddEquipment);
-              isAddEquipment: isAddEquipment);
         } else {
           BuglyTool.uploadException(
-              message:
+              message: '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
-                  '开始连接 当是安卓设备 且不存在缓存设备 且是当前设备 且mac地址不为空 上传记录当前方法是：_connect',
+              detail: '调用方法startScanSingle，执行扫描函数,needScanSingle：$needScanSingle',
-              detail:
-                  '调用方法startScanSingle，执行扫描函数,needScanSingle：$needScanSingle',
               upload: false);
           startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
-            _connectDevice(scanDevices, deviceName, connectStateCallBack,
+            _connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment);
-                isAddEquipment: isAddEquipment);
           });
         }
       } catch (e) {
@@ -536,8 +479,7 @@ class BlueManage {
             detail: '调用方法doNotSearchBLE发生异常，执行扫描函数 startScanSingle，异常信息：$e',
             upload: false);
         startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
-          _connectDevice(scanDevices, deviceName, connectStateCallBack,
+          _connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment);
-              isAddEquipment: isAddEquipment);
         });
       }
       //
@@ -554,16 +496,13 @@ class BlueManage {
     } else if (isAddEquipment == false && isExistDevice == false) {
       // 取消缓存直接使用，存在配对场景设备信息会更变
       BuglyTool.uploadException(
-          message:
+          message: '取消缓存直接使用，存在配对场景设备信息会更变 然后开始指定设备名称的扫描蓝牙设备 上传记录当前方法是：_connect',
-              '取消缓存直接使用，存在配对场景设备信息会更变 然后开始指定设备名称的扫描蓝牙设备 上传记录当前方法是：_connect',
+          detail: '符合条件(isAddEquipment == false && isExistDevice == false) 下一步调用startScanSingle',
-          detail:
-              '符合条件(isAddEquipment == false && isExistDevice == false) 下一步调用startScanSingle',
           upload: false);
 
       // AppLog.log('无存在设备需要扫描 deviceName:$deviceName isAddEquipment:$isAddEquipment');
       startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
-        _connectDevice(scanDevices, deviceName, connectStateCallBack,
+        _connectDevice(scanDevices, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment);
-            isAddEquipment: isAddEquipment);
       });
     } else {
       BuglyTool.uploadException(
@@ -572,16 +511,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,
+      _connectDevice(devicesList, deviceName, connectStateCallBack, isAddEquipment: isAddEquipment);
-          isAddEquipment: isAddEquipment);
     }
   }
 
   //查找缓存里面是否有设备
   bool isExistScanDevices(String connectDeviceName) {
-    final bool isExistDevice = scanDevices.any((ScanResult element) =>
+    final bool isExistDevice = scanDevices
-        element.device.platformName == connectDeviceName ||
+        .any((ScanResult element) => element.device.platformName == connectDeviceName || element.advertisementData.advName == connectDeviceName);
-        element.advertisementData.advName == connectDeviceName);
     return isExistDevice;
   }
 
@@ -592,154 +529,66 @@ class BlueManage {
     bool isAddEquipment = false, // 是否是添加设备之前
     bool isReconnect = true, // 是否是重连
   }) async {
-    // 判断数组列表里面是否有这个设备
+    final int knownDeviceIndex =
-    // AppLog.log("devicesList:$devicesList");
+        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 =
+      connectDeviceMacAddress = devicesList[knownDeviceIndex].advertisementData.advName.isNotEmpty
-          devicesList[knownDeviceIndex].advertisementData.advName.isNotEmpty
           ? devicesList[knownDeviceIndex].advertisementData.advName
           : devicesList[knownDeviceIndex].device.platformName;
 
       bluetoothConnectDevice = devicesList[knownDeviceIndex].device;
       scanResult = devicesList[knownDeviceIndex];
-      // AppLog.log('bluetoothConnectDevice: $bluetoothConnectDevice scanResult:$scanResult');
 
       _initGetMtuSubscription();
       _initListenConnectionState();
     }
     if (scanResult == null || connectDeviceMacAddress.isEmpty) {
       BuglyTool.uploadException(
-          message:
+          message: '扫描结果scanResult == null || connectDeviceMacAddress.isEmpty不往下执行 return 上传记录当前方法是：_connectDevice',
-              '扫描结果scanResult == null || connectDeviceMacAddress.isEmpty不往下执行 return 上传记录当前方法是：_connectDevice',
+          detail: 'scanResult:$scanResult connectDeviceMacAddress：$connectDeviceMacAddress',
-          detail:
-              'scanResult:$scanResult connectDeviceMacAddress：$connectDeviceMacAddress',
           upload: false);
       return;
     }
-    AppLog.log('调用了停止扫描的方法');
-    await stopScan();
-    if (scanResult.advertisementData.serviceUuids[0].toString().length >= 5 &&
-        (scanResult.advertisementData.serviceUuids[0].toString()[5] == '0') &&
-        isAddEquipment == false) {
-      // 添加这个判断是因为有些苹果设备或者安卓等性能比较好的设备时，添加完锁之后，锁板未改变为已添加状态之前，就进行了蓝牙连接，导致添加完锁就失败，这里进行了判断，如果第一次连接失败，就清除缓存重新扫描连接
-      if (isReconnect == true) {
-        AppLog.log('该锁已被重置, 重新发送扫描命令');
-
-        BuglyTool.uploadException(
-            message: '该锁已被重置, 重新发送扫描命令startScanSingle 上传记录当前方法是：_connectDevice',
-            detail:
-                '添加这个判断是因为有些苹果设备或者安卓等性能比较好的设备时，添加完锁之后，锁板未改变为已添加状态之前，就进行了蓝牙连接，导致添加完锁就失败，这里进行了判断，如果第一次连接失败，就清除缓存重新扫描连接 该锁已被重置, 重新发送扫描命令 serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}',
-            upload: false);
-
-        scanDevices.clear();
-        startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
-          _connectDevice(scanDevices, deviceName, connectStateCallBack,
-              isAddEquipment: isAddEquipment, isReconnect: false);
-        });
-      } else {
-        connectStateCallBack(BluetoothConnectionState.disconnected);
-        if (!F.isSKY) {
-          EasyLoading.showToast('该锁已被重置'.tr, duration: 2000.milliseconds);
-        }
-
-        scanDevices.clear();
-
-        BuglyTool.uploadException(
-            message: '提示该锁已被重置, 回调断开连接, 清除缓存，上传记录当前方法是：_connectDevice',
-            detail:
-                'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}',
-            upload: false);
-      }
-      return;
-    }
-    if (scanResult.advertisementData.serviceUuids[0].toString().length >= 30 &&
-        (scanResult.advertisementData.serviceUuids[0].toString()[31] == '0') &&
-        isAddEquipment == false) {
-      // 添加这个判断是因为有些苹果设备或者安卓等性能比较好的设备时，添加完锁之后，锁板未改变为已添加状态之前，就进行了蓝牙连接，导致添加完锁就失败，这里进行了判断，如果第一次连接失败，就清除缓存重新扫描连接
-      if (isReconnect == true) {
-        AppLog.log('该锁已被重置, 重新发送扫描命令');
-
-        BuglyTool.uploadException(
-            message: '该锁已被重置, 重新发送扫描命令startScanSingle 上传记录当前方法是：_connectDevice',
-            detail:
-                '添加这个判断是因为有些苹果设备或者安卓等性能比较好的设备时，添加完锁之后，锁板未改变为已添加状态之前，就进行了蓝牙连接，导致添加完锁就失败，这里进行了判断，如果第一次连接失败，就清除缓存重新扫描连接 该锁已被重置, 重新发送扫描命令 serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}',
-            upload: false);
-
-        scanDevices.clear();
-        startScanSingle(deviceName, 15, (List<ScanResult> scanDevices) {
-          _connectDevice(scanDevices, deviceName, connectStateCallBack,
-              isAddEquipment: isAddEquipment, isReconnect: true);
-        });
-      } else {
-        connectStateCallBack(BluetoothConnectionState.disconnected);
-        if (!F.isSKY) {
-          EasyLoading.showToast('该锁已被重置'.tr, duration: 2000.milliseconds);
-        }
-        scanDevices.clear();
-
-        BuglyTool.uploadException(
-            message: '提示该锁已被重置, 回调断开连接, 清除缓存，上传记录当前方法是：_connectDevice',
-            detail:
-                'isReconnect:$isReconnect serviceUuids:${scanResult.advertisementData.serviceUuids[0].toString()}',
-            upload: false);
-      }
-      return;
-    }
-
-    BuglyTool.uploadException(
-        message: '从devicesList里面查到了设备 下一步连接设备 上传记录当前方法是：_connectDevice',
-        detail:
-            'devicesList:$devicesList scanResult:${scanResult.toString()} bluetoothConnectDevice：${bluetoothConnectDevice.toString()} connectDeviceMacAddress：$connectDeviceMacAddress',
-        upload: false);
 
     //连接设备
     await bluetoothDeviceConnect(bluetoothConnectDevice!, connectStateCallBack);
   }
 
   //直接给蓝牙设备写入
-  Future<void> doNotSearchBLE(
+  Future<void> doNotSearchBLE(String masAdds, ConnectStateCallBack connectStateCallBack, {bool isAddEquipment = false}) async {
-      String masAdds, ConnectStateCallBack connectStateCallBack,
-      {bool isAddEquipment = false}) async {
     await FlutterBluePlus.stopScan();
 
-    if (bluetoothConnectDevice == null ||
+    if (bluetoothConnectDevice == null || bluetoothConnectDevice?.remoteId.str != masAdds) {
-        bluetoothConnectDevice?.remoteId.str != masAdds) {
       bluetoothConnectDevice = BluetoothDevice.fromId(masAdds);
       _initGetMtuSubscription();
       _initListenConnectionState();
       BuglyTool.uploadException(
-          message: '直接给蓝牙设备写入 上传记录当前方法是：doNotSearchBLE',
+          message: '直接给蓝牙设备写入 上传记录当前方法是：doNotSearchBLE', detail: '直接给蓝牙设备写入 通过fromId方法创建一个BluetoothDevice masAdds：$masAdds', upload: false);
-          detail: '直接给蓝牙设备写入 通过fromId方法创建一个BluetoothDevice masAdds：$masAdds',
-          upload: false);
     } else {
       BuglyTool.uploadException(
           message: '直接给蓝牙设备写入 上传记录当前方法是：doNotSearchBLE',
-          detail:
+          detail: '直接给蓝牙设备写入 用传入的bluetoothConnectDevice：${bluetoothConnectDevice.toString()}连接 masAdds:$masAdds',
-              '直接给蓝牙设备写入 用传入的bluetoothConnectDevice：${bluetoothConnectDevice.toString()}连接 masAdds:$masAdds',
           upload: false);
     }
     //尝试连接设备
-    await bluetoothDeviceConnect(bluetoothConnectDevice!, connectStateCallBack,
+    await bluetoothDeviceConnect(bluetoothConnectDevice!, connectStateCallBack, isAddEquipment: isAddEquipment);
-        isAddEquipment: isAddEquipment);
   }
 
   //设备连接
-  Future<void> bluetoothDeviceConnect(BluetoothDevice bluetoothConnectDevice,
+  Future<void> bluetoothDeviceConnect(BluetoothDevice bluetoothConnectDevice, ConnectStateCallBack connectStateCallBack,
-      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,
+          mtu: 512,
+        );
         break; // If the connection is successful, break the loop
       } catch (e) {
         AppLog.log('连接失败 重连了: $e');
@@ -754,8 +603,7 @@ class BlueManage {
       AppLog.log('$maxAttempts次后尝试连接失败');
       BuglyTool.uploadException(
           message: '连接三次超时断开连接 回调断开连接 上传记录当前方法是：bluetoothDeviceConnect',
-          detail:
+          detail: 'bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} $maxAttempts次后尝试连接失败',
-              'bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} $maxAttempts次后尝试连接失败',
           upload: false);
       needScanSingle = true;
       connectStateCallBack(BluetoothConnectionState.disconnected);
@@ -764,22 +612,22 @@ class BlueManage {
     if (bluetoothConnectionState == BluetoothConnectionState.connected) {
       try {
         needScanSingle = false;
-        final List<BluetoothService> services =
+        final List<BluetoothService> services = await bluetoothConnectDevice.discoverServices();
-            await bluetoothConnectDevice.discoverServices();
         //循环判断服务
         for (final BluetoothService service in services) {
           if (service.uuid == _serviceIdConnect) {
-            for (final BluetoothCharacteristic characteristic
+            for (final BluetoothCharacteristic characteristic in service.characteristics) {
-                in service.characteristics) {
+              if (characteristic.characteristicUuid == _characteristicIdSubscription) {
-              if (characteristic.characteristicUuid ==
-                  _characteristicIdSubscription) {
                 _subScribeToCharacteristic(characteristic);
                 bluetoothConnectionState = BluetoothConnectionState.connected;
                 connectStateCallBack(bluetoothConnectionState!);
+
+                if (Platform.isAndroid) {
+                  await bluetoothConnectDevice.requestMtu(512);
+                }
                 BuglyTool.uploadException(
                     message: '订阅成功  上传记录当前方法是：bluetoothDeviceConnect',
-                    detail:
+                    detail: '发现服务，连接成功，订阅数据 bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} ',
-                        '发现服务，连接成功，订阅数据 bluetoothDeviceConnect:${bluetoothConnectDevice.toString()} ',
                     upload: false);
               } else {
                 BuglyTool.uploadException(
@@ -801,22 +649,16 @@ class BlueManage {
         needScanSingle = true;
         bluetoothConnectionState = BluetoothConnectionState.disconnected;
         connectStateCallBack(bluetoothConnectionState!);
-        AppLog.log(
+        AppLog.log('发现设备时失败 e:$e bluetoothConnectionState:$bluetoothConnectionState');
-            '发现设备时失败 e:$e bluetoothConnectionState:$bluetoothConnectionState');
         BuglyTool.uploadException(
-            message: '发现服务时失败',
+            message: '发现服务时失败', detail: '发现服务时报错原因e：$e bluetoothDeviceConnect:${bluetoothConnectDevice.toString()}', upload: false);
-            detail:
-                '发现服务时报错原因e：$e bluetoothDeviceConnect:${bluetoothConnectDevice.toString()}',
-            upload: false);
         rethrow;
       }
     }
   }
 
-  Future<void> _subScribeToCharacteristic(
+  Future<void> _subScribeToCharacteristic(BluetoothCharacteristic characteristic) async {
-      BluetoothCharacteristic characteristic) async {
+    final StreamSubscription<List<int>> subscription = characteristic.onValueReceived.listen((List<int> data) {
-    final StreamSubscription<List<int>> subscription =
-        characteristic.onValueReceived.listen((List<int> data) {
       AppLog.log('订阅获取的数据： $data ');
       if (data == lastTimeData || data.isEmpty) {
         return;
@@ -864,10 +706,7 @@ class BlueManage {
       return false;
     }
     //239, 1, 238, 2, 是数据包头
-    if ((data[0] == 0xEF) &&
+    if ((data[0] == 0xEF) && (data[1] == 0x01) && (data[2] == 0xEE) && (data[3] == 0x02)) {
-        (data[1] == 0x01) &&
-        (data[2] == 0xEE) &&
-        (data[3] == 0x02)) {
       return true;
     } else {
       return false;
@@ -876,20 +715,30 @@ class BlueManage {
 
   /// 写入蓝牙特征值，并等待响应
   Future<void> writeCharacteristicWithResponse(List<int> value) async {
-    final List<BluetoothService> services =
+    final List<BluetoothService> services = await bluetoothConnectDevice!.discoverServices();
-        await bluetoothConnectDevice!.discoverServices();
     for (final BluetoothService service in services) {
       if (service.uuid == _serviceIdConnect) {
-        for (final BluetoothCharacteristic characteristic
+        for (final BluetoothCharacteristic characteristic in service.characteristics) {
-            in service.characteristics) {
           if (characteristic.characteristicUuid == _characteristicIdWrite) {
             try {
+              _initGetMtuSubscription();
+              // 如果MTU还是默认值，尝试重新请求
+              if ((_mtuSize == 23 || _mtuSize == 20) && bluetoothConnectDevice != null) {
+                try {
+                  if (Platform.isAndroid) {
+                    await bluetoothConnectDevice!.requestMtu(512);
+                  }
+                } catch (e) {
+                  AppLog.log('重新请求MTU失败: $e');
+                }
+              }
               // 添加重试机制
               int retryCount = 0;
               const int maxRetries = 3;
               const int retryDelayMs = 500;
 
               final List<int> valueList = value;
+              AppLog.log('发送数据时当前的mtuSize是:${_mtuSize}');
               final List subData = splitList(valueList, _mtuSize!);
 
               for (int i = 0; i < subData.length; i++) {
@@ -900,27 +749,22 @@ class BlueManage {
                 while (!packetSent && retryCount < maxRetries) {
                   try {
                     if (characteristic.properties.writeWithoutResponse) {
-                      await characteristic.write(subData[i],
+                      await characteristic.write(subData[i], withoutResponse: true);
-                          withoutResponse: true);
                     } else if (characteristic.properties.write) {
                       await characteristic.write(subData[i]);
                     } else {
                       // 特性不支持写入
-                      throw Exception(
+                      throw Exception('This characteristic does not support writing.');
-                          'This characteristic does not support writing.');
                     }
 
                     // 如果到这里没有异常，则包发送成功
                     packetSent = true;
                   } catch (e) {
-                    if (e.toString().contains('UNKNOWN_GATT_ERROR (133)') &&
+                    if (e.toString().contains('UNKNOWN_GATT_ERROR (133)') && retryCount < maxRetries - 1) {
-                        retryCount < maxRetries - 1) {
                       // GATT错误133，尝试重试
                       retryCount++;
-                      AppLog.log(
+                      AppLog.log('蓝牙写入失败(GATT 133)，数据包 ${i + 1}/${subData.length} 正在重试 $retryCount/$maxRetries...');
-                          '蓝牙写入失败(GATT 133)，数据包 ${i + 1}/${subData.length} 正在重试 $retryCount/$maxRetries...');
+                      await Future.delayed(Duration(milliseconds: retryDelayMs));
-                      await Future.delayed(
-                          Duration(milliseconds: retryDelayMs));
                       continue;
                     } else {
                       // 其他错误或已达到最大重试次数，抛出异常
@@ -931,8 +775,7 @@ class BlueManage {
                 }
 
                 if (!packetSent) {
-                  throw Exception(
+                  throw Exception('蓝牙写入失败，数据包 ${i + 1}/${subData.length} 已达到最大重试次数');
-                      '蓝牙写入失败，数据包 ${i + 1}/${subData.length} 已达到最大重试次数');
                 }
               }
 
@@ -971,14 +814,12 @@ class BlueManage {
       _mtuSize = 20; // 重置MTU为默认值
 
       if (bluetoothConnectionState == BluetoothConnectionState.connected) {
+        AppLog.log('请求断开蓝牙连接');
         //加快蓝牙断连
-        await bluetoothConnectDevice!.disconnect(timeout: 3);
+        await bluetoothConnectDevice!.disconnect(timeout: 1);
-        AppLog.log('断开连接成功');
       }
     } on Exception catch (e, _) {
       AppLog.log('断开连接失败: $e');
-    } finally {
-      bluetoothConnectionState = BluetoothConnectionState.disconnected;
     }
   }
 

lib/blue/io_protocol/io_readRegisterKey.dart

@@ -0,0 +1,74 @@
+import 'dart:convert';
+
+import '../io_tool/io_tool.dart';
+import '../sm4Encipher/sm4.dart';
+import '../io_reply.dart';
+import '../io_sender.dart';
+import '../io_type.dart';
+import 'package:crypto/crypto.dart' as crypto;
+
+/// 读取注册密钥
+class SenderReadRegisterKeyCommand extends SenderProtocol {
+  SenderReadRegisterKeyCommand({
+    this.lockID,
+    this.token,
+    this.needAuthor,
+    this.publicKey,
+    this.privateKey,
+  }) : super(CommandType.readRegisterKey);
+
+  String? lockID;
+
+  List<int>? token;
+  int? needAuthor;
+  List<int>? publicKey;
+  List<int>? privateKey;
+
+  @override
+  String toString() {
+    return 'SenderReadRegisterKeyCommand{ lockID: $lockID, token: $token, '
+        'needAuthor: $needAuthor, publicKey: $publicKey, '
+        'privateKey: $privateKey}';
+  }
+
+  @override
+  List<int> messageDetail() {
+    List<int> data = <int>[];
+    List<int> ebcData = <int>[];
+
+    // 指令类型
+    final int type = commandType!.typeValue;
+    final double typeDouble = type / 256;
+    final int type1 = typeDouble.toInt();
+    final int type2 = type % 256;
+    data.add(type1);
+    data.add(type2);
+
+    // 锁id 40
+    final int lockIDLength = utf8.encode(lockID!).length;
+    data.addAll(utf8.encode(lockID!));
+    data = getFixedLengthList(data, 40 - lockIDLength);
+
+    if ((data.length % 16) != 0) {
+      final int add = 16 - data.length % 16;
+      for (int i = 0; i < add; i++) {
+        data.add(0);
+      }
+    }
+
+    printLog(data);
+
+    ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB);
+    return ebcData;
+  }
+}
+
+class SenderReadRegisterKeyCommandReply extends Reply {
+  SenderReadRegisterKeyCommandReply.parseData(CommandType commandType, List<int> dataDetail)
+      : super.parseData(commandType, dataDetail) {
+    data = dataDetail;
+
+    final int status = data[6];
+    errorWithStstus(status);
+  }
+}

lib/blue/io_protocol/io_sendAuthorizationCode.dart

@@ -0,0 +1,106 @@
+import 'dart:convert';
+
+import '../io_tool/io_tool.dart';
+import '../sm4Encipher/sm4.dart';
+import '../io_reply.dart';
+import '../io_sender.dart';
+import '../io_type.dart';
+import 'package:crypto/crypto.dart' as crypto;
+
+/// 发送授权码
+class SenderAuthorizationCodeCommand extends SenderProtocol {
+  SenderAuthorizationCodeCommand({
+    this.lockID,
+    this.uuid,
+    this.key,
+    this.mac,
+    this.platform,
+    this.utcTimeStamp,
+    this.token,
+    this.needAuthor,
+    this.publicKey,
+    this.privateKey,
+  }) : super(CommandType.sendAuthorizationCode);
+
+  String? lockID;
+  String? uuid;
+  String? key;
+  String? mac;
+  int? platform; //0：锁通通；1：涂鸦智能
+  int? utcTimeStamp;
+
+  List<int>? token;
+  int? needAuthor;
+  List<int>? publicKey;
+  List<int>? privateKey;
+
+  @override
+  String toString() {
+    return 'SenderAuthorizationCodeCommand{ lockID: $lockID, token: $token, '
+        'needAuthor: $needAuthor, publicKey: $publicKey, '
+        'privateKey: $privateKey}';
+  }
+
+  @override
+  List<int> messageDetail() {
+    List<int> data = <int>[];
+    List<int> ebcData = <int>[];
+
+    // 指令类型
+    final int type = commandType!.typeValue;
+    final double typeDouble = type / 256;
+    final int type1 = typeDouble.toInt();
+    final int type2 = type % 256;
+    data.add(type1);
+    data.add(type2);
+
+    // 锁id 40
+    final int lockIDLength = utf8.encode(lockID!).length;
+    data.addAll(utf8.encode(lockID!));
+    data = getFixedLengthList(data, 40 - lockIDLength);
+
+    // uuid 40
+    final int uuidLength = utf8.encode(uuid!).length;
+    data.addAll(utf8.encode(uuid!));
+    data = getFixedLengthList(data, 40 - uuidLength);
+
+    // key 40
+    final int keyLength = utf8.encode(key!).length;
+    data.addAll(utf8.encode(key!));
+    data = getFixedLengthList(data, 40 - keyLength);
+
+    // mac 40
+    final int macLength = utf8.encode(mac!).length;
+    data.addAll(utf8.encode(mac!));
+    data = getFixedLengthList(data, 40 - macLength);
+
+    data.add(platform!);
+
+    data.add((utcTimeStamp! & 0xff000000) >> 24);
+    data.add((utcTimeStamp! & 0xff0000) >> 16);
+    data.add((utcTimeStamp! & 0xff00) >> 8);
+    data.add(utcTimeStamp! & 0xff);
+
+    if ((data.length % 16) != 0) {
+      final int add = 16 - data.length % 16;
+      for (int i = 0; i < add; i++) {
+        data.add(0);
+      }
+    }
+
+    printLog(data);
+
+    ebcData = SM4.encrypt(data, key: privateKey, mode: SM4CryptoMode.ECB);
+    return ebcData;
+  }
+}
+
+class SenderAuthorizationCodeCommandReply extends Reply {
+  SenderAuthorizationCodeCommandReply.parseData(CommandType commandType, List<int> dataDetail)
+      : super.parseData(commandType, dataDetail) {
+    data = dataDetail;
+
+    final int status = data[6];
+    errorWithStstus(status);
+  }
+}

lib/blue/io_tool/io_model.dart

@@ -27,6 +27,11 @@ class EventSendModel {
   Uuid? serviceId;
   Uuid? characteristicId;
   bool? allowLongWrite = false;
+
+  @override
+  String toString() {
+    return 'EventSendModel{data: $data, topic: $topic, sendChannel: $sendChannel, deviceId: $deviceId, serviceId: $serviceId, characteristicId: $characteristicId, allowLongWrite: $allowLongWrite}';
+  }
 }
 
 ///接收数据类

lib/blue/io_type.dart

@@ -9,10 +9,10 @@ List<String> getDeviceType(DeviceType deviceType) {
   List<String> t = ['758824'];
   switch (deviceType) {
     case DeviceType.blue:
-      t = ['758824', '75', '768824', '76','24'];
+      t = ['758824', '75', '768824', '76', '24'];
       break;
     case DeviceType.gateway:
-      t = ['758825','25'];
+      t = ['758825', '25'];
       break;
   }
   return t;
@@ -53,6 +53,8 @@ enum CommandType {
   gatewayGetWifiList, //网关获取附近的wifi列表  0x30F6
   gatewayGetWifiListResult, //网关获取附近的wifi列表结果  0x30F7
   gatewayGetStatus, //获取网关状态  0x30F8
+  readRegisterKey, //读取注册密钥  0x30A7
+  sendAuthorizationCode, //发送授权码  0x30A6
 
   generalExtendedCommond, // 通用扩展指令 = 0x3030
   gecChangeAdministratorPassword, // 通用扩展指令子命令-修改管理员密码 = 2
@@ -245,6 +247,16 @@ extension ExtensionCommandType on CommandType {
           type = CommandType.gatewayGetStatus;
         }
         break;
+      case 0x30A6:
+        {
+          type = CommandType.sendAuthorizationCode;
+        }
+        break;
+      case 0x30A7:
+        {
+          type = CommandType.readRegisterKey;
+        }
+        break;
       default:
         {
           type = CommandType.readStarLockStatusInfo;
@@ -353,6 +365,12 @@ extension ExtensionCommandType on CommandType {
       case CommandType.setLockCurrentVoicePacket:
         type = 0x30A5;
         break;
+      case CommandType.sendAuthorizationCode:
+        type = 0x30A6;
+        break;
+      case CommandType.readRegisterKey:
+        type = 0x30A7;
+        break;
       default:
         type = 0x300A;
         break;
@@ -492,6 +510,12 @@ extension ExtensionCommandType on CommandType {
       case 0x30A5:
         t = '设置锁当前语音包';
         break;
+      case 0x30A6:
+        t = '发送授权码';
+        break;
+      case 0x30A7:
+        t = '读取注册密钥';
+        break;
       default:
         t = '读星锁状态信息';
         break;

lib/blue/reciver_data.dart

@@ -16,10 +16,12 @@ import 'package:star_lock/blue/io_protocol/io_getDeviceModel.dart';
 import 'package:star_lock/blue/io_protocol/io_otaUpgrade.dart';
 import 'package:star_lock/blue/io_protocol/io_processOtaUpgrade.dart';
 import 'package:star_lock/blue/io_protocol/io_readAdminPassword.dart';
+import 'package:star_lock/blue/io_protocol/io_readRegisterKey.dart';
 import 'package:star_lock/blue/io_protocol/io_readSupportFunctionsNoParameters.dart';
 import 'package:star_lock/blue/io_protocol/io_readSupportFunctionsWithParameters.dart';
 import 'package:star_lock/blue/io_protocol/io_readVoicePackageFinalResult.dart';
 import 'package:star_lock/blue/io_protocol/io_referEventRecordTime.dart';
+import 'package:star_lock/blue/io_protocol/io_sendAuthorizationCode.dart';
 import 'package:star_lock/blue/io_protocol/io_setSupportFunctionsNoParameters.dart';
 import 'package:star_lock/blue/io_protocol/io_setSupportFunctionsWithParameters.dart';
 import 'package:star_lock/blue/io_protocol/io_setVoicePackageFinalResult.dart';
@@ -331,6 +333,18 @@ class CommandReciverManager {
                 SetVoicePackageFinalResultReply.parseData(commandType, data);
           }
           break;
+        case CommandType.readRegisterKey:
+          {
+            reply =
+                SenderReadRegisterKeyCommandReply.parseData(commandType, data);
+          }
+          break;
+        case CommandType.sendAuthorizationCode:
+          {
+            reply =
+                SenderAuthorizationCodeCommandReply.parseData(commandType, data);
+          }
+          break;
         case CommandType.generalExtendedCommond:
           {
             // 子命令类型

lib/blue/sender_beforeDataManage.dart

@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:star_lock/blue/entity/lock_user_no_list_entity.dart';
@@ -22,10 +21,10 @@ import 'io_tool/manager_event_bus.dart';
 import 'sender_data.dart';
 
 class SenderBeforeDataManage {
-
   factory SenderBeforeDataManage() => shareManager()!;
 
   SenderBeforeDataManage._init();
+
   static SenderBeforeDataManage? _manager;
 
   static SenderBeforeDataManage? shareManager() {
@@ -42,6 +41,7 @@ class SenderBeforeDataManage {
 
   // 监听设备返回的数据
   StreamSubscription<Reply>? _replySubscription;
+
   // 是否是添加用户之前的调用
   bool isBeforeAddUser = true;
 
@@ -146,10 +146,8 @@ class SenderBeforeDataManage {
 
   //获取清除用户列表指令
   Future<List<int>> getCleanUpUsers({List<int>? tokenList}) async {
-    final LockUserNoListEntity entity = await ApiRepository.to
+    final LockUserNoListEntity entity = await ApiRepository.to.getLockUserNoList(lockId: CommonDataManage().currentKeyInfo.lockId!);
-        .getLockUserNoList(lockId: CommonDataManage().currentKeyInfo.lockId!);
+    if (!entity.errorCode!.codeIsSuccessful || (entity.data?.userNos ?? <int>[]).isEmpty) {
-    if (!entity.errorCode!.codeIsSuccessful ||
-        (entity.data?.userNos ?? <int>[]).isEmpty) {
       throw Exception('ApiRepository.to.getLockUserNoList  访问失败');
     }
     final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
@@ -197,19 +195,20 @@ class SenderBeforeDataManage {
     int endDateTime = 0;
     bool isRound = false;
     int useCountLimit = 0xffff;
-     if(currentKeyInfo.keyType == XSConstantMacro.keyTypeTime){
+    if (currentKeyInfo.keyType == XSConstantMacro.keyTypeTime) {
       // 限时
       startDateTime = currentKeyInfo.startDate! ~/ 1000;
       endDateTime = currentKeyInfo.endDate! ~/ 1000;
-    }else if(currentKeyInfo.keyType == XSConstantMacro.keyTypeLoop){
+    } else if (currentKeyInfo.keyType == XSConstantMacro.keyTypeLoop) {
       // 循环
       isRound = true;
       startTime = DateTime.fromMillisecondsSinceEpoch(currentKeyInfo.startDate!);
       endTime = DateTime.fromMillisecondsSinceEpoch(currentKeyInfo.endDate!);
 
       startDateTime = DateTool().dateToTimestamp(DateTool().dateToYMDString(currentKeyInfo.startDate!.toString()), 1) ~/ 1000;
-      endDateTime = (DateTool().dateToTimestamp(DateTool().dateToYMDString(currentKeyInfo.endDate!.toString()), 1) + CommonDataManage().dayLatestTime) ~/ 1000;
+      endDateTime =
-    }else if(currentKeyInfo.keyType == XSConstantMacro.keyTypeOnce){
+          (DateTool().dateToTimestamp(DateTool().dateToYMDString(currentKeyInfo.endDate!.toString()), 1) + CommonDataManage().dayLatestTime) ~/ 1000;
+    } else if (currentKeyInfo.keyType == XSConstantMacro.keyTypeOnce) {
       // 单次
       useCountLimit = 1;
     }
@@ -217,7 +216,7 @@ class SenderBeforeDataManage {
     // AppLog.log("startTime.hour:${startTime!.hour} startTime.minute:${startTime!.minute} endTime.hour:${endTime!.hour} endTime.minute:${endTime!.minute}}");
     final AddUserCommand addUserData = AddUserCommand(
         lockID: BlueManage().connectDeviceName,
-        authUserID: currentKeyInfo.senderUserId!.toString(),
+        authUserID: currentKeyInfo.senderUserId?.toString() ?? '1',
         keyID: currentKeyInfo.keyId.toString(),
         userID: await Storage.getUid(),
         openMode: 1,
@@ -226,10 +225,7 @@ class SenderBeforeDataManage {
         expireDate: endDateTime,
         useCountLimit: useCountLimit,
         isRound: isRound ? 1 : 0,
-        weekRound: isRound
+        weekRound: isRound ? DateTool().accordingTheCycleIntoTheCorrespondingNumber(currentKeyInfo.weekDays!) : 0,
-            ? DateTool().accordingTheCycleIntoTheCorrespondingNumber(
-                currentKeyInfo.weekDays!)
-            : 0,
         startHour: isRound ? startTime!.hour : 0,
         startMin: isRound ? startTime!.minute : 0,
         endHour: isRound ? endTime!.hour : 0,
@@ -271,8 +267,7 @@ class SenderBeforeDataManage {
   // 普通用户接收电子钥匙之后 更新锁用户NO
   Future<void> _updateLockUserNo(List<int> dataList) async {
     final LockNetTokenEntity entity = await ApiRepository.to.updateLockUserNo(
-        keyId: CommonDataManage().currentKeyInfo.keyId.toString(),
+        keyId: CommonDataManage().currentKeyInfo.keyId.toString(), lockUserNo: CommonDataManage().currentKeyInfo.lockUserNo.toString());
-        lockUserNo: CommonDataManage().currentKeyInfo.lockUserNo.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       eventBus.fire(RefreshLockListInfoDataEvent());
       eventBus.fire(LockAddUserSucceedEvent(<int>[0], 0));
@@ -281,9 +276,8 @@ class SenderBeforeDataManage {
 
   // 更新锁用户InitUserNo
   Future<void> _updateLockInitUserNo() async {
-    final LockNetTokenEntity entity = await ApiRepository.to.updateLockInitUserNo(
+    final LockNetTokenEntity entity = await ApiRepository.to
-        lockId: CommonDataManage().currentKeyInfo.lockId ?? 0,
+        .updateLockInitUserNo(lockId: CommonDataManage().currentKeyInfo.lockId ?? 0, initUserNo: CommonDataManage().currentKeyInfo.initUserNo ?? 0);
-        initUserNo: CommonDataManage().currentKeyInfo.initUserNo ?? 0);
     if (entity.errorCode!.codeIsSuccessful) {
       eventBus.fire(RefreshLockListInfoDataEvent());
       eventBus.fire(LockInitUserNoEvent());

lib/blue/sender_manage.dart

@@ -6,6 +6,8 @@ import 'package:star_lock/blue/io_protocol/io_deletUser.dart';
 import 'package:star_lock/blue/io_protocol/io_otaUpgrade.dart';
 import 'package:star_lock/blue/io_protocol/io_processOtaUpgrade.dart';
 import 'package:star_lock/blue/io_protocol/io_readAdminPassword.dart';
+import 'package:star_lock/blue/io_protocol/io_readRegisterKey.dart';
+import 'package:star_lock/blue/io_protocol/io_sendAuthorizationCode.dart';
 
 import 'io_gateway/io_gateway_configuringWifi.dart';
 import 'io_gateway/io_gateway_getStatus.dart';
@@ -1109,10 +1111,7 @@ class IoSenderManage {
 
   //ota 升级过程
   static void senderProcessOtaUpgradeCommand(
-      {required int? index,
+      {required int? index, required int? size, required List<int>? data, CommandSendCallBack? callBack}) {
-      required int? size,
-      required List<int>? data,
-      CommandSendCallBack? callBack}) {
     CommandSenderManager().managerSendData(
         command: ProcessOtaUpgradeCommand(
           index: index,
@@ -1321,8 +1320,7 @@ class IoSenderManage {
   }
 
   // 网关获取wifi列表
-  static void gatewayGetWifiCommand(
+  static void gatewayGetWifiCommand({required String? userID, CommandSendCallBack? callBack}) {
-      {required String? userID, CommandSendCallBack? callBack}) {
     CommandSenderManager().managerSendData(
         command: GatewayGetWifiCommand(
           userID: userID,
@@ -1339,21 +1337,51 @@ class IoSenderManage {
       CommandSendCallBack? callBack}) {
     CommandSenderManager().managerSendData(
         command: GatewayConfiguringWifiCommand(
-            ssid: ssid,
+            ssid: ssid, password: password, gatewayConfigurationStr: gatewayConfigurationStr),
-            password: password,
-            gatewayConfigurationStr: gatewayConfigurationStr),
         isBeforeAddUser: true,
         callBack: callBack);
   }
 
   // 获取网关状态
   static void gatewayGetStatusCommand(
-      {required String? lockID,
+      {required String? lockID, required String? userID, CommandSendCallBack? callBack}) {
-      required String? userID,
-      CommandSendCallBack? callBack}) {
     CommandSenderManager().managerSendData(
-        command: GatewayGetStatusCommand(lockID: lockID, userID: userID),
+        command: GatewayGetStatusCommand(lockID: lockID, userID: userID), isBeforeAddUser: true, callBack: callBack);
+  }
+
+  // 读取注册密钥
+  static void readRegisterKey({
+    required String? lockID,
+    CommandSendCallBack? callBack,
+  }) {
+    CommandSenderManager().managerSendData(
+      command: SenderReadRegisterKeyCommand(lockID: lockID),
       isBeforeAddUser: true,
-        callBack: callBack);
+      callBack: callBack,
+    );
+  }
+
+  // 发送授权码
+  static void sendAuthorizationCode({
+    required String? lockID,
+    required String? uuid,
+    required String? key,
+    required String? mac,
+    required int? platform,
+    required int? utcTimeStamp,
+    CommandSendCallBack? callBack,
+  }) {
+    CommandSenderManager().managerSendData(
+      command: SenderAuthorizationCodeCommand(
+        lockID: lockID,
+        uuid: uuid,
+        key: key,
+        mac: mac,
+        platform: platform,
+        utcTimeStamp: utcTimeStamp,
+      ),
+      isBeforeAddUser: true,
+      callBack: callBack,
+    );
   }
 }

lib/login/login/starLock_login_page.dart

@@ -55,8 +55,7 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
           if (state.isChina == true)
             IconButton(
                 onPressed: () {
-                    WechatManageTool.getAppInfo(
+                  WechatManageTool.getAppInfo(CustomerTool.openCustomerService);
-                        CustomerTool.openCustomerService);
                 },
                 icon: const Icon(
                   Icons.support_agent,
@@ -81,7 +80,7 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
         ],
       ),
       body: GestureDetector(
-          onTap: (){
+        onTap: () {
           FocusScope.of(context).unfocus();
         },
         child: ListView(
@@ -89,9 +88,7 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
           children: <Widget>[
             Container(
                 padding: EdgeInsets.all(10.w),
-                  child: Center(
+                child: Center(child: Image.asset('images/icon_main_sky_1024.png', width: 110.w, height: 110.w))),
-                      child: Image.asset('images/icon_main_sky_1024.png',
-                          width: 110.w, height: 110.w))),
             SizedBox(height: 50.w),
             Obx(() => CommonItem(
                   leftTitel: '你所在的国家/地区'.tr,
@@ -103,12 +100,10 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                   rightWidget: Text(
                     '${state.countryName} +${state.countryCode.value}',
                     textAlign: TextAlign.end,
-                      style: TextStyle(
+                    style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor),
-                          fontSize: 22.sp, color: AppColors.darkGrayTextColor),
                   ),
                   action: () async {
-                      final result =
+                    final result = await Get.toNamed(Routers.selectCountryRegionPage);
-                          await Get.toNamed(Routers.selectCountryRegionPage);
                     if (result != null) {
                       result as Map<String, dynamic>;
                       state.countryCode.value = result['code'];
@@ -124,8 +119,7 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                   logic.checkNext(state.emailOrPhoneController);
                 },
                 leftWidget: Padding(
-                    padding: EdgeInsets.only(
+                  padding: EdgeInsets.only(top: 30.w, bottom: 20.w, right: 5.w, left: 5.w),
-                        top: 30.w, bottom: 20.w, right: 5.w, left: 5.w),
                   child: Image.asset(
                     'images/icon_login_account.png',
                     width: 36.w,
@@ -149,8 +143,7 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                 isPwd: true,
                 // isSuffixIcon: 2,
                 leftWidget: Padding(
-                    padding: EdgeInsets.only(
+                  padding: EdgeInsets.only(top: 30.w, bottom: 20.w, right: 5.w, left: 5.w),
-                        top: 30.w, bottom: 20.w, right: 5.w, left: 5.w),
                   child: Image.asset(
                     'images/icon_login_password.png',
                     width: 36.w,
@@ -172,12 +165,9 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                     },
                     child: Container(
                       // color: Colors.red,
-                        padding: EdgeInsets.only(
+                      padding: EdgeInsets.only(left: 5.w, top: 20.w, right: 10.w, bottom: 20.h),
-                            left: 5.w, top: 20.w, right: 10.w, bottom: 20.h),
                       child: Image.asset(
-                          state.agree.value
+                        state.agree.value ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png',
-                              ? 'images/icon_round_select.png'
-                              : 'images/icon_round_unSelect.png',
                         width: 35.w,
                         height: 35.w,
                       ),
@@ -189,19 +179,15 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                   child: RichText(
                       text: TextSpan(
                     text: '我已阅读并同意'.tr,
-                      style: TextStyle(
+                    style: TextStyle(color: const Color(0xff333333), fontSize: 20.sp),
-                          color: const Color(0xff333333), fontSize: 20.sp),
                     children: <InlineSpan>[
                       WidgetSpan(
                           alignment: PlaceholderAlignment.middle,
                           child: GestureDetector(
-                              child: Text('《${'用户协议'.tr}》',
+                            child:
-                                  style: TextStyle(
+                                Text('《${'用户协议'.tr}》', style: TextStyle(color: AppColors.mainColor, fontSize: 20.sp)),
-                                      color: AppColors.mainColor,
-                                      fontSize: 20.sp)),
                             onTap: () {
-                                Get.toNamed(Routers.webviewShowPage,
+                              Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
-                                    arguments: <String, String>{
                                 'url': XSConstantMacro.userAgreementURL,
                                 'title': '用户协议'.tr
                               });
@@ -210,13 +196,10 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                       WidgetSpan(
                           alignment: PlaceholderAlignment.middle,
                           child: GestureDetector(
-                              child: Text('《${'隐私政策'.tr}》',
+                            child:
-                                  style: TextStyle(
+                                Text('《${'隐私政策'.tr}》', style: TextStyle(color: AppColors.mainColor, fontSize: 20.sp)),
-                                      color: AppColors.mainColor,
-                                      fontSize: 20.sp)),
                             onTap: () {
-                                Get.toNamed(Routers.webviewShowPage,
+                              Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
-                                    arguments: <String, String>{
                                 'url': XSConstantMacro.privacyPolicyURL,
                                 'title': '隐私政策'.tr
                               });
@@ -272,45 +255,19 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                     height: 50.h,
                     // color: Colors.red,
                     child: Center(
-                        child: Text('${'忘记密码'.tr}？',
+                      child: Text('${'忘记密码'.tr}？', style: TextStyle(fontSize: 22.sp, color: AppColors.mainColor)),
-                            style: TextStyle(
-                                fontSize: 22.sp, color: AppColors.mainColor)),
                     ),
                   ),
                   onTap: () {
-                      Navigator.pushNamed(
+                    Navigator.pushNamed(context, Routers.starLockForgetPasswordPage);
-                          context, Routers.starLockForgetPasswordPage);
                   },
                 ),
-                  Expanded(
-                      child: SizedBox(
-                    width: 10.sp,
-                  )),
-                  Obx(() => Visibility(
-                        visible: state.isCheckVerifyEnable.value &&
-                            state.currentLanguage == 'zh_CN',
-                        child: GestureDetector(
-                          child: SizedBox(
-                            // width: 150.w,
-                            height: 50.h,
-                            // color: Colors.red,
-                            child: Center(
-                              child: Text('一键登录'.tr,
-                                  style: TextStyle(
-                                      fontSize: 22.sp,
-                                      color: AppColors.mainColor)),
-                            ),
-                          ),
-                          onTap: () {
-                            logic.oneClickLoginAction(context);
-                          },
-                        ),
-                      ))
               ],
             ),
           ],
         ),
-        ));
+      ),
+    );
   }
 
   Widget loginInput(
@@ -351,8 +308,7 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                   inputFormatters: inputFormatters,
                   decoration: InputDecoration(
                     //输入里面输入文字内边距设置
-                    contentPadding: const EdgeInsets.only(
+                    contentPadding: const EdgeInsets.only(top: 8.0, left: -19.0, right: -15.0, bottom: 8.0),
-                        top: 8.0, left: -19.0, right: -15.0, bottom: 8.0),
                     labelText: label,
                     labelStyle: TextStyle(fontSize: 22.sp),
                     hintStyle: TextStyle(fontSize: 22.sp),

lib/login/register/starLock_register_logic.dart

@@ -84,8 +84,7 @@ class StarLockRegisterLogic extends BaseGetXController {
   }
 
   Future<void> sendValidationCode() async {
-    final SendValidationCodeEntity entity =
+    final SendValidationCodeEntity entity = await ApiRepository.to.sendValidationCodeUnLogin(
-        await ApiRepository.to.sendValidationCodeUnLogin(
         // state.countryCode.value,
         countryCode: state.countryCode.value.toString(),
         account: state.phoneOrEmailStr.value,
@@ -100,13 +99,17 @@ class StarLockRegisterLogic extends BaseGetXController {
   Future<void> checkIpAction() async {
     final CheckIPEntity entity = await ApiRepository.to.checkIpAction(ip: '');
     if (entity.errorCode!.codeIsSuccessful) {
+      if (entity.data!.abbreviation != 'CN') {
+        showToast('当前国家不支持手机验证码注册，请使用邮箱进行注册'.tr);
+        state.isIphoneType.value = false;
+        return;
+      }
       if (state.countryName.value != entity.data!.name) {
         ShowTipView().showSureAlertDialog(
-            '国家地区的选择将影响数据安全，你当前选择的是'.tr +
+          '国家地区的选择将影响数据安全，你当前选择的是'.tr + '${state.countryName.value},' + '请确认后再继续'.tr,
-                '${state.countryName.value},' +
-                '请确认后再继续'.tr,
           tipTitle: '确认国家或地区'.tr,
-            sureStr: '我知道了'.tr);
+          sureStr: '我知道了'.tr,
+        );
       }
     }
   }
@@ -138,19 +141,16 @@ class StarLockRegisterLogic extends BaseGetXController {
 
   // 重置是否能提交
   void _resetCanSub() {
-    state.canSub.value = state.pwdIsOK &&
+    state.canSub.value = state.pwdIsOK && state.codeIsOK && state.phoneOrEmailStr.value.isNotEmpty;
-        state.codeIsOK &&
-        state.phoneOrEmailStr.value.isNotEmpty;
   }
 
   // 重置是否能发送验证码
   void _resetCanSendCode() {
-    state.canSendCode.value =
+    state.canSendCode.value = state.pwdIsOK && state.phoneOrEmailStr.value.isNotEmpty;
-        state.pwdIsOK && state.phoneOrEmailStr.value.isNotEmpty;
   }
 
   @override
-  void onReady() {
+  void onReady() async {
     super.onReady();
 
     XSConstantMacro().getDeviceInfoData().then((Map<String, dynamic> data) {
@@ -159,5 +159,7 @@ class StarLockRegisterLogic extends BaseGetXController {
       // 适当处理错误
       AppLog.log('获取设备信息时出错: $error');
     });
+
+    await checkIpAction();
   }
 }

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';
@@ -65,7 +68,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
             _buildBottomAgreement()
           ],
         ),
-        ));
+      ),
+    );
   }
 
   Widget topSelectCountryAndRegionWidget() {
@@ -79,7 +83,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
               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: <Widget>[
                   GestureDetector(
@@ -153,13 +158,16 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                 child: Row(
                   children: <Widget>[
                     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: <Widget>[
                         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 +287,19 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
             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: <String, Object>{'countryCode': state.countryCode, 'account': state.phoneOrEmailStr.value});
+                              arguments: <String, Object>{
+                                'countryCode': state.countryCode,
+                                'account': state.phoneOrEmailStr.value
+                              });
                           state.xWidth.value = (result! as Map<String, dynamic>)['xWidth'];
                           logic.sendValidationCode();
                         }
@@ -338,7 +356,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                   child: GestureDetector(
                     child: Text('《${'用户协议'.tr}》', style: TextStyle(color: AppColors.mainColor, fontSize: 20.sp)),
                     onTap: () {
-                      Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{'url': XSConstantMacro.userAgreementURL, 'title': '用户协议'.tr});
+                      Get.toNamed(Routers.webviewShowPage,
+                          arguments: <String, String>{'url': XSConstantMacro.userAgreementURL, 'title': '用户协议'.tr});
                     },
                   )),
               WidgetSpan(
@@ -346,7 +365,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                   child: GestureDetector(
                     child: Text('《${'隐私政策'.tr}》', style: TextStyle(color: AppColors.mainColor, fontSize: 20.sp)),
                     onTap: () {
-                      Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{'url': XSConstantMacro.privacyPolicyURL, 'title': '隐私政策'.tr});
+                      Get.toNamed(Routers.webviewShowPage,
+                          arguments: <String, String>{'url': XSConstantMacro.privacyPolicyURL, 'title': '隐私政策'.tr});
                     },
                   )),
             ],

lib/main/lockDetail/face/faceList/faceList_logic.dart

@@ -316,6 +316,7 @@ class FaceListLogic extends BaseGetXController {
       {required bool isRefresh}) async {
     if (isRefresh) {
       state.faceItemListData.clear();
+      state.faceItemListData.refresh();
       pageNo = 1;
     }
     final FingerprintListDataEntity entity =

lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart

@@ -25,11 +25,9 @@ class FingerprintListLogic extends BaseGetXController {
   late StreamSubscription<Reply> _replySubscription;
 
   void _initReplySubscription() {
-    _replySubscription =
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
-        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
       // 添加指纹开始(此处用作删除指纹)
-      if ((reply is SenderAddFingerprintWithTimeCycleCoercionReply) &&
+      if ((reply is SenderAddFingerprintWithTimeCycleCoercionReply) && (state.ifCurrentScreen.value == true)) {
-          (state.ifCurrentScreen.value == true)) {
         _replyAddFingerprintBegin(reply);
       }
 
@@ -57,13 +55,10 @@ class FingerprintListLogic extends BaseGetXController {
         break;
       case 0x06:
         //无权限
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
-            changeStringListToIntList(privateKey!);
 
-        final List<String>? signKey =
+        final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
-            await Storage.getStringList(saveBlueSignKey);
         final List<int> signKeyDataList = changeStringListToIntList(signKey!);
 
         final List<int> token = reply.data.sublist(5, 9);
@@ -257,20 +252,16 @@ class FingerprintListLogic extends BaseGetXController {
     showBlueConnetctToastTimer(action: () {
       dismissEasyLoading();
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
-        (BluetoothConnectionState deviceConnectionState) async {
       if (deviceConnectionState == BluetoothConnectionState.connected) {
         // var publicKey = await Storage.getStringList(saveBluePublicKey);
         // List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
 
-        final List<String>? signKey =
+        final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
-            await Storage.getStringList(saveBlueSignKey);
         final List<int> signKeyDataList = changeStringListToIntList(signKey!);
 
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
-            changeStringListToIntList(privateKey!);
 
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
@@ -298,8 +289,7 @@ class FingerprintListLogic extends BaseGetXController {
             privateKey: getPrivateKeyList,
             token: getTokenList,
             isBeforeAddUser: false);
-      } else if (deviceConnectionState ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
         if (state.ifCurrentScreen.value == true) {
@@ -337,15 +327,15 @@ class FingerprintListLogic extends BaseGetXController {
    */
 
   // 获取指纹列表
-  Future<FingerprintListDataEntity> getFingerprintsListData(
+  Future<FingerprintListDataEntity> getFingerprintsListData({required bool isRefresh}) async {
-      {required bool isRefresh}) async {
     // 如果是下拉刷新，清空已有数据
-    // if (isRefresh) {
+    if (isRefresh) {
-      state.fingerprintItemListData.clear();
       pageNo = 1;
+      state.fingerprintItemListData.clear();
+      state.fingerprintItemListData.refresh();
+    }
 
-    final FingerprintListDataEntity entity =
+    final FingerprintListDataEntity entity = await ApiRepository.to.getFingerprintsListData(
-        await ApiRepository.to.getFingerprintsListData(
       lockId: state.lockId.value.toString(),
       pageNo: pageNo.toString(),
       pageSize: pageSize.toString(),
@@ -381,10 +371,7 @@ class FingerprintListLogic extends BaseGetXController {
       type = '0';
     }
     final LoginEntity entity = await ApiRepository.to.deletFingerprintsData(
-        fingerprintId: fingerprintId,
+        fingerprintId: fingerprintId, lockId: state.lockId.value.toString(), type: type, deleteType: '1');
-        lockId: state.lockId.value.toString(),
-        type: type,
-        deleteType: '1');
     if (entity.errorCode!.codeIsSuccessful) {
       if (state.isDeletAll == false) {
         showToast('删除成功'.tr, something: () {
@@ -402,9 +389,7 @@ class FingerprintListLogic extends BaseGetXController {
   late StreamSubscription _teamEvent;
 
   void _initRefreshAction() {
-    _teamEvent = eventBus
+    _teamEvent = eventBus.on<OtherTypeRefreshListEvent>().listen((OtherTypeRefreshListEvent event) async {
-        .on<OtherTypeRefreshListEvent>()
-        .listen((OtherTypeRefreshListEvent event) async {
       // 立即刷新数据
       await getFingerprintsListData(isRefresh: true);
     });
@@ -415,8 +400,7 @@ class FingerprintListLogic extends BaseGetXController {
     String keyTypeStr = ''; //
     // (fingerprintItemData.fingerprintType! != 1) ? (fingerprintItemData.endDate! < DateTime.now().millisecondsSinceEpoch ? "已失效" : "") : ""
     if (fingerprintItemData.fingerprintStatus == 1) {
-      if (fingerprintItemData.startDate! >
+      if (fingerprintItemData.startDate! > DateTime.now().millisecondsSinceEpoch) {
-          DateTime.now().millisecondsSinceEpoch) {
         keyTypeStr = '未生效'.tr;
       }
     } else if (fingerprintItemData.fingerprintStatus == 2) {
@@ -428,8 +412,7 @@ class FingerprintListLogic extends BaseGetXController {
   String getKeyDateType(FingerprintItemData fingerprintItemData) {
     String keyDateTypeStr = ''; // 永久:1;限时2，单次3，循环:4
     if (fingerprintItemData.fingerprintType! == 1) {
-      keyDateTypeStr =
+      keyDateTypeStr = "${DateTool().dateToYMDHNString(fingerprintItemData.createDate.toString())} ${"永久".tr}";
-          "${DateTool().dateToYMDHNString(fingerprintItemData.createDate.toString())} ${"永久".tr}";
     } else if (fingerprintItemData.fingerprintType! == 2) {
       keyDateTypeStr =
           '${DateTool().dateToYMDHNString(fingerprintItemData.startDate.toString())} - ${DateTool().dateToYMDHNString(fingerprintItemData.endDate.toString())} ${'限时'.tr}';
@@ -442,11 +425,10 @@ class FingerprintListLogic extends BaseGetXController {
 
   //刷新单条信息
   Future<void> refreshIndividualKeys({required int fingerprintId}) async {
-    final FingerprintEntity entity =
+    final FingerprintEntity entity = await ApiRepository.to.getFingerprintsData(fingerprintId);
-        await ApiRepository.to.getFingerprintsData(fingerprintId);
     if (entity.errorCode!.codeIsSuccessful) {
-      final int index = state.fingerprintItemListData.indexWhere(
+      final int index =
-          (FingerprintItemData item) => item.fingerprintId == fingerprintId);
+          state.fingerprintItemListData.indexWhere((FingerprintItemData item) => item.fingerprintId == fingerprintId);
       state.fingerprintItemListData.removeAt(index);
       state.fingerprintItemListData.insert(index, entity.data!);
     }

lib/main/lockDetail/lockDetail/ActivateInfoResponse.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 class ActivateInfoResponse {
   ActivateInfoResponse({
     this.description,
@@ -9,16 +11,99 @@ class ActivateInfoResponse {
   ActivateInfoResponse.fromJson(dynamic json) {
     description = json['description'];
     errorCode = json['errorCode'];
-    // 修改这里：如果 json['data'] 是列表，则解析为 List<ActivateInfo>；否则为空列表
+    // 修改这里：直接解析为单个 ActivateInfo 对象
-    data = json['data'] != null
+    data = json['data'] != null ? ActivateInfo.fromJson(json['data']) : null;
-        ? (json['data'] as List).map((item) => ActivateInfo.fromJson(item)).toList()
-        : [];
     errorMsg = json['errorMsg'];
   }
 
   String? description;
   int? errorCode;
-  List<ActivateInfo>? data;  // 改为 List<ActivateInfo>
+  ActivateInfo? data; // 改为 List<ActivateInfo>
+  String? errorMsg;
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['description'] = description;
+    map['errorCode'] = errorCode;
+    if (data != null) {
+      // 修改这里：将单个 ActivateInfo 对象转换为 JSON
+      map['data'] = data!.toJson();
+    }
+    map['errorMsg'] = errorMsg;
+    return map;
+  }
+
+  @override
+  String toString() {
+    return 'ActivateInfoResponse{description: $description, errorCode: $errorCode, data: $data, errorMsg: $errorMsg}';
+  }
+}
+
+class ActivateInfo {
+  String? authCode;
+  String? activatedAt;
+  Map<String, dynamic>? extraParams; // 修改为 Map 类型
+
+  ActivateInfo({
+    this.authCode,
+    this.activatedAt,
+    this.extraParams,
+  });
+
+  ActivateInfo.fromJson(dynamic json) {
+    authCode = json['auth_code'] ?? '';
+    activatedAt = json['activated_at'] ?? '';
+    // 修改这里：将 extraParams 解析为 Map 对象
+    if (json['extra_params'] != null) {
+      if (json['extra_params'] is Map) {
+        extraParams = json['extra_params'];
+      } else if (json['extra_params'] is String) {
+        // 如果是字符串，尝试解析为 JSON 对象
+        try {
+          extraParams = jsonDecode(json['extra_params']);
+        } catch (e) {
+          // 解析失败则设为 null 或空 map
+          extraParams = {};
+        }
+      }
+    } else {
+      extraParams = {};
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['authCode'] = authCode;
+    map['activatedAt'] = activatedAt;
+    map['extraParams'] = extraParams;
+    return map;
+  }
+
+  @override
+  String toString() {
+    return 'ActivateInfo{authCode: $authCode, activatedAt: $activatedAt, extraParams: $extraParams}';
+  }
+}
+
+class TppSupportResponse {
+  TppSupportResponse({
+    this.description,
+    this.errorCode,
+    this.data, // 现在是一个 List<ActivateInfo>
+    this.errorMsg,
+  });
+
+  TppSupportResponse.fromJson(dynamic json) {
+    description = json['description'];
+    errorCode = json['errorCode'];
+    // 修改这里：如果 json['data'] 是列表，则解析为 List<ActivateInfo>；否则为空列表
+    data = json['data'] != null ? (json['data'] as List).map((item) => TppSupportInfo.fromJson(item)).toList() : [];
+    errorMsg = json['errorMsg'];
+  }
+
+  String? description;
+  int? errorCode;
+  List<TppSupportInfo>? data; // 改为 List<ActivateInfo>
   String? errorMsg;
 
   Map<String, dynamic> toJson() {
@@ -35,33 +120,28 @@ class ActivateInfoResponse {
 
   @override
   String toString() {
-    return 'ActivateInfoResponse{description: $description, errorCode: $errorCode, data: $data, errorMsg: $errorMsg}';
+    return 'TppSupportResponse{description: $description, errorCode: $errorCode, data: $data, errorMsg: $errorMsg}';
   }
 }
 
-class ActivateInfo {
+class TppSupportInfo {
-  String? platformName;
   int? platform;
+  String? platformName;
 
-  ActivateInfo({
+  TppSupportInfo({
-    this.platformName,
     this.platform,
+    this.platformName,
   });
 
-  ActivateInfo.fromJson(dynamic json) {
+  TppSupportInfo.fromJson(dynamic json) {
-    platformName = json['platformName'] ?? '';
+    platform = json['platform'] as int? ?? -1;
-    platform = json['platform'] ?? '';
+    platformName = json['platform_name'] as String? ?? '';
   }
 
   Map<String, dynamic> toJson() {
     final map = <String, dynamic>{};
-    map['platformName'] = platformName;
     map['platform'] = platform;
+    map['platform_name'] = platformName;
     return map;
   }
-
-  @override
-  String toString() {
-    return 'ActivateInfo{platformName: $platformName, platform: $platform}';
-  }
 }

lib/main/lockDetail/lockDetail/lockDetail_logic.dart

@@ -54,12 +54,26 @@ class LockDetailLogic extends BaseGetXController {
   //节流器，用来限制开锁按钮的触发频率
   FunctionBlocker functionBlocker = FunctionBlocker(duration: const Duration(seconds: 2));
 
+  // 防抖Timer
+  Timer? _openDoorReplyDebounceTimer;
+
+  // 带防抖控制的开门回复处理
+  void _handleOpenDoorReplyWithDebounce(Reply reply) {
+    // 取消之前的Timer
+    _openDoorReplyDebounceTimer?.cancel();
+
+    // 设置新的Timer，200ms后执行
+    _openDoorReplyDebounceTimer = Timer(const Duration(milliseconds: 1500), () {
+      _replyOpenLock(reply);
+    });
+  }
+
   // 监听设备返回的数据
   void initReplySubscription() {
     state.replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
       // 开门
       if (reply is OpenDoorReply) {
-        _replyOpenLock(reply);
+        _handleOpenDoorReplyWithDebounce(reply);
       }
 
       // 开完锁之后上传记录
@@ -143,7 +157,7 @@ class LockDetailLogic extends BaseGetXController {
         await uploadElectricQuantityRequest();
 
         resetOpenDoorState();
-        state.animationController!.stop();
+        state.animationController?.stop();
 
         //锁数据更新
         AppLog.log('开锁成功，开始同步所记录:getLockRecordLastUploadDataTime');
@@ -165,6 +179,7 @@ class LockDetailLogic extends BaseGetXController {
         }
 
         _handleSynchronizeUploadLockData();
+
         break;
       case 0x06:
         //无权限
@@ -339,7 +354,7 @@ class LockDetailLogic extends BaseGetXController {
   //开门指令失败
   void openDoorError() {
     resetOpenDoorState();
-    state.animationController!.stop();
+    state.animationController?.stop();
     blueManageDisconnect();
   }
 
@@ -348,7 +363,7 @@ class LockDetailLogic extends BaseGetXController {
     state.openLockBtnState.value = 0;
     // state.openDoorBtnisUneable.value = true;
     if (state.animationController != null) {
-      state.animationController!.stop(canceled: true);
+      state.animationController?.stop(canceled: true);
     }
     cancelBlueConnetctToastTimer();
   }
@@ -643,6 +658,7 @@ class LockDetailLogic extends BaseGetXController {
     if (list.isEmpty) {
       return;
     }
+    AppLog.log('list:${list}');
     final KeyOperationRecordEntity entity =
         await ApiRepository.to.lockRecordUploadData(lockId: state.keyInfos.value.lockId.toString(), records: list);
     if (entity.errorCode!.codeIsSuccessful) {
@@ -928,7 +944,9 @@ class LockDetailLogic extends BaseGetXController {
   }
 
   void _handleGetLockPasswordData() {
-    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
+    BlueManage().blueSendData(
+      BlueManage().connectDeviceName,
+      (BluetoothConnectionState connectionState) async {
         if (connectionState == BluetoothConnectionState.connected) {
           final List<String>? token = await Storage.getStringList(saveBlueToken);
           final List<int> getTokenList = changeStringListToIntList(token!);
@@ -949,7 +967,8 @@ class LockDetailLogic extends BaseGetXController {
               signKey: signKeyDataList,
               privateKey: getPrivateKeyList);
         }
-    });
+      },
+    );
   }
 
   // 上传数据获取锁密码列表
@@ -963,7 +982,7 @@ class LockDetailLogic extends BaseGetXController {
           // 当数据是10的时候继续请求
           state.uploadPasswordPage = state.uploadPasswordPage + 1;
           final List<int> token = reply.data.sublist(3, 7);
-          showEasyLoading();
+
           BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
             if (connectionState == BluetoothConnectionState.connected) {
               final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
@@ -1067,7 +1086,6 @@ class LockDetailLogic extends BaseGetXController {
 
           final List<int> token = reply.data.sublist(3, 7);
 
-          showEasyLoading();
           BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
             if (connectionState == BluetoothConnectionState.connected) {
               final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
@@ -1171,7 +1189,6 @@ class LockDetailLogic extends BaseGetXController {
 
           final List<int> token = reply.data.sublist(3, 7);
 
-          showEasyLoading();
           BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
             if (connectionState == BluetoothConnectionState.connected) {
               final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
@@ -1325,7 +1342,6 @@ class LockDetailLogic extends BaseGetXController {
 
           final List<int> token = reply.data.sublist(3, 7);
 
-          showEasyLoading();
           BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
             if (connectionState == BluetoothConnectionState.connected) {
               final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
@@ -1402,7 +1418,6 @@ class LockDetailLogic extends BaseGetXController {
 
           final List<int> token = reply.data.sublist(3, 7);
 
-          showEasyLoading();
           BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
             if (connectionState == BluetoothConnectionState.connected) {
               final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
@@ -1479,7 +1494,6 @@ class LockDetailLogic extends BaseGetXController {
 
           final List<int> token = reply.data.sublist(3, 7);
 
-          showEasyLoading();
           BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
             if (connectionState == BluetoothConnectionState.connected) {
               final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
@@ -1503,6 +1517,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:

lib/main/lockDetail/lockDetail/lockDetail_page.dart

@@ -34,11 +34,7 @@ import '../../lockMian/entity/lockListInfo_entity.dart';
 import 'lockDetail_logic.dart';
 
 class LockDetailPage extends StatefulWidget {
-  const LockDetailPage(
+  const LockDetailPage({required this.isOnlyOneData, required this.lockListInfoItemEntity, Key? key}) : super(key: key);
-      {required this.isOnlyOneData,
-      required this.lockListInfoItemEntity,
-      Key? key})
-      : super(key: key);
   final bool isOnlyOneData;
   final LockListInfoItemEntity lockListInfoItemEntity;
 
@@ -46,29 +42,26 @@ class LockDetailPage extends StatefulWidget {
   State<LockDetailPage> createState() => _LockDetailPageState();
 }
 
-class _LockDetailPageState extends State<LockDetailPage>
+class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStateMixin, RouteAware {
-    with TickerProviderStateMixin, RouteAware {
   // with RouteAware
   final LockDetailLogic logic = Get.put(LockDetailLogic());
   final LockDetailState state = Get.find<LockDetailLogic>().state;
 
   @override
   void initState() {
-    super.initState();
+    state.animationController = AnimationController(duration: const Duration(seconds: 1), vsync: this);
-
+    state.animationController?.repeat();
-    state.animationController =
-        AnimationController(duration: const Duration(seconds: 1), vsync: this);
-    state.animationController!.repeat();
     //动画开始、结束、向前移动或向后移动时会调用StatusListener
-    state.animationController!.addStatusListener((AnimationStatus status) {
+    state.animationController?.addStatusListener((AnimationStatus status) {
       if (status == AnimationStatus.completed) {
-        state.animationController!.reset();
+        state.animationController?.reset();
-        state.animationController!.forward();
+        state.animationController?.forward();
       } else if (status == AnimationStatus.dismissed) {
-        state.animationController!.reset();
+        state.animationController?.reset();
-        state.animationController!.forward();
+        state.animationController?.forward();
       }
     });
+    super.initState();
 
     state.pageController.addListener(() {
       state.currentPage.value = state.pageController.page!.round();
@@ -77,9 +70,7 @@ class _LockDetailPageState extends State<LockDetailPage>
     _initRefreshLockDetailInfoDataEventAction();
     logic.initReplySubscription();
     logic.initLockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceAction();
-    logic.loadData(
+    logic.loadData(lockListInfoItemEntity: widget.lockListInfoItemEntity, isOnlyOneData: widget.isOnlyOneData);
-        lockListInfoItemEntity: widget.lockListInfoItemEntity,
-        isOnlyOneData: widget.isOnlyOneData);
   }
 
   @override
@@ -95,9 +86,8 @@ class _LockDetailPageState extends State<LockDetailPage>
 
   void _initRefreshLockDetailInfoDataEventAction() {
     // 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus
-    _lockRefreshLockDetailInfoDataEvent = eventBus
+    _lockRefreshLockDetailInfoDataEvent =
-        .on<RefreshLockDetailInfoDataEvent>()
+        eventBus.on<RefreshLockDetailInfoDataEvent>().listen((RefreshLockDetailInfoDataEvent event) {
-        .listen((RefreshLockDetailInfoDataEvent event) {
       setState(() {});
     });
   }
@@ -109,17 +99,12 @@ class _LockDetailPageState extends State<LockDetailPage>
 
   //鑫泓佳布局
   Widget xhjWidget() {
-    final bool isShowTip = (state.keyInfos.value.keyType ==
+    final bool isShowTip = (state.keyInfos.value.keyType == XSConstantMacro.keyTypeTime ||
-                XSConstantMacro.keyTypeTime ||
             state.keyInfos.value.keyType == XSConstantMacro.keyTypeLoop) &&
-        (DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) <=
+        (DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) <= 15 &&
-                15 &&
+            DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) >= 0) &&
-            DateTool()
-                    .compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) >=
-                0) &&
         (state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusNormalUse ||
-            state.keyInfos.value.keyStatus ==
+            state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusWaitReceive);
-                XSConstantMacro.keyStatusWaitReceive);
     return Scaffold(
       backgroundColor: Colors.white,
       body: Obx(() {
@@ -141,8 +126,7 @@ class _LockDetailPageState extends State<LockDetailPage>
                           maxLines: 2,
                           overflow: TextOverflow.ellipsis,
                           textAlign: TextAlign.center,
-                          style: TextStyle(
+                          style: TextStyle(color: const Color(0xffCBA74B), fontSize: 24.sp)),
-                              color: const Color(0xffCBA74B), fontSize: 24.sp)),
                     ),
                   ),
                   SizedBox(height: 10.h),
@@ -161,10 +145,7 @@ class _LockDetailPageState extends State<LockDetailPage>
                   SizedBox(
                     height: 20.h,
                   ),
-                  labelText(
+                  labelText(img: 'images/icon_slider_horizontal.png', text: '功能'.tr, child: bottomWidget()),
-                      img: 'images/icon_slider_horizontal.png',
-                      text: '功能'.tr,
-                      child: bottomWidget()),
                   btnText(
                       img: 'images/main/icon_main_set.png',
                       text: '设置'.tr,
@@ -172,17 +153,13 @@ class _LockDetailPageState extends State<LockDetailPage>
                         if (state.openDoorBtnisUneable.value == false) {
                           return;
                         }
-                        Get.toNamed(Routers.lockSetPage,
+                        Get.toNamed(Routers.lockSetPage, arguments: <String, Object?>{
-                            arguments: <String, Object?>{
                           'lockId': state.keyInfos.value.lockId,
                           'isOnlyOneData': state.isOnlyOneData
                         });
                       }),
                   if (!F.isProductionEnv)
-                    labelText(
+                    labelText(img: 'images/icon_puzzlepiece_extension.png', text: '配件'.tr, child: attachmentWidget()),
-                        img: 'images/icon_puzzlepiece_extension.png',
-                        text: '配件'.tr,
-                        child: attachmentWidget()),
                 ],
               ),
             ),
@@ -201,17 +178,14 @@ class _LockDetailPageState extends State<LockDetailPage>
     );
   }
 
-  Widget btnText(
+  Widget btnText({required String img, required String text, required var onTap}) {
-      {required String img, required String text, required var onTap}) {
     return GestureDetector(
       onTap: onTap,
       child: Container(
         margin: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 15.h),
         padding: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 30.h),
-        decoration: BoxDecoration(
+        decoration:
-            color: Colors.white,
+            BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(16.r), boxShadow: <BoxShadow>[
-            borderRadius: BorderRadius.circular(16.r),
-            boxShadow: <BoxShadow>[
           BoxShadow(
             color: Colors.black.withOpacity(0.15),
             offset: const Offset(0, 0),
@@ -247,15 +221,11 @@ class _LockDetailPageState extends State<LockDetailPage>
     );
   }
 
-  Widget labelText(
+  Widget labelText({required String img, required String text, required Widget child}) {
-      {required String img, required String text, required Widget child}) {
     return Container(
       margin: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 15.h),
       padding: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 15.h),
-      decoration: BoxDecoration(
+      decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(16.r), boxShadow: <BoxShadow>[
-          color: Colors.white,
-          borderRadius: BorderRadius.circular(16.r),
-          boxShadow: <BoxShadow>[
         BoxShadow(
           color: Colors.black.withOpacity(0.15),
           offset: const Offset(0, 0),
@@ -328,13 +298,10 @@ class _LockDetailPageState extends State<LockDetailPage>
                 Row(
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: <Widget>[
-                    Image.asset(showElectricIcon(state.electricQuantity.value),
+                    Image.asset(showElectricIcon(state.electricQuantity.value), width: 30.w, height: 24.w),
-                        width: 30.w, height: 24.w),
                     SizedBox(width: 2.w),
                     Text('${state.electricQuantity.value}%',
-                        style: TextStyle(
+                        style: TextStyle(fontSize: 18.sp, color: AppColors.darkGrayTextColor)),
-                            fontSize: 18.sp,
-                            color: AppColors.darkGrayTextColor)),
                     SizedBox(width: 2.w),
                     Icon(
                       Icons.info, // 使用内置的 warning 图标，它是一个叹号
@@ -345,24 +312,17 @@ class _LockDetailPageState extends State<LockDetailPage>
                   ],
                 ),
                 Visibility(
-                  visible: state
+                  visible: state.keyInfos.value.lockFeature!.isSupportBackupBattery == 1,
-                          .keyInfos.value.lockFeature!.isSupportBackupBattery ==
-                      1,
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.end,
                     children: <Widget>[
                       FlavorsImg(
-                        child: Image.asset(
+                        child: Image.asset(showElectricIcon(state.electricQuantityStandby.value),
-                            showElectricIcon(
+                            width: 30.w, height: 24.w),
-                                state.electricQuantityStandby.value),
-                            width: 30.w,
-                            height: 24.w),
                       ),
                       SizedBox(width: 2.w),
                       Text('${state.electricQuantityStandby.value}%',
-                          style: TextStyle(
+                          style: TextStyle(fontSize: 18.sp, color: AppColors.darkGrayTextColor)),
-                              fontSize: 18.sp,
-                              color: AppColors.darkGrayTextColor)),
                       SizedBox(width: 2.w),
                       FlavorsImg(
                         child: Icon(
@@ -386,8 +346,7 @@ class _LockDetailPageState extends State<LockDetailPage>
                   child: GestureDetector(
                     onTap: () {
                       if (state.openDoorBtnisUneable.value == true) {
-                        logic.functionBlocker
+                        logic.functionBlocker.block(isNeedRealNameAuthThenOpenLock);
-                            .block(isNeedRealNameAuthThenOpenLock);
                       }
                     },
                     onLongPressStart: (LongPressStartDetails details) {
@@ -457,12 +416,10 @@ class _LockDetailPageState extends State<LockDetailPage>
                   right: 90.w,
                   bottom: 1,
                   child: Obx(() => Visibility(
-                      visible:
+                      visible: state.keyInfos.value.lockSetting!.remoteUnlock == 1,
-                          state.keyInfos.value.lockSetting!.remoteUnlock == 1,
                       child: GestureDetector(
                         onTap: () {
-                          ShowCupertinoAlertView().isToRemoteUnLockAlert(
+                          ShowCupertinoAlertView().isToRemoteUnLockAlert(remoteUnlockAction: () {
-                              remoteUnlockAction: () {
                             if (state.keyInfos.value.hasGateway != 1) {
                               logic.showToast('附近没有可用网关'.tr);
                             }
@@ -508,34 +465,24 @@ class _LockDetailPageState extends State<LockDetailPage>
     return ListView(
       children: <Widget>[
         Visibility(
-          visible:
+          visible: (state.keyInfos.value.keyType == XSConstantMacro.keyTypeTime ||
-              (state.keyInfos.value.keyType == XSConstantMacro.keyTypeTime ||
+                  state.keyInfos.value.keyType == XSConstantMacro.keyTypeLoop) && // 限时、循环
-                      state.keyInfos.value.keyType ==
+              (DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) <= 15 &&
-                          XSConstantMacro.keyTypeLoop) && // 限时、循环
+                  DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) >= 0) && // 0到30天
-                  (DateTool().compareTimeGetDaysFromNow(
+              (state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusNormalUse ||
-                              state.keyInfos.value.endDate!) <=
+                  state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusWaitReceive) // 正常使用、待接收
-                          15 &&
-                      DateTool().compareTimeGetDaysFromNow(
-                              state.keyInfos.value.endDate!) >=
-                          0) && // 0到30天
-                  (state.keyInfos.value.keyStatus ==
-                          XSConstantMacro.keyStatusNormalUse ||
-                      state.keyInfos.value.keyStatus ==
-                          XSConstantMacro.keyStatusWaitReceive) // 正常使用、待接收
           ,
           child: Container(
             // height: 30.h,
             width: 1.sw,
             color: const Color(0xFFFBEFD4),
-            padding:
+            padding: EdgeInsets.only(top: 8.h, bottom: 8.h, right: 10.w, left: 10.h),
-                EdgeInsets.only(top: 8.h, bottom: 8.h, right: 10.w, left: 10.h),
             child: Text(
                 "${"钥匙将在".tr}${DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!)}${"天后失效".tr}",
                 maxLines: 2,
                 overflow: TextOverflow.ellipsis,
                 textAlign: TextAlign.center,
-                style:
+                style: TextStyle(color: const Color(0xffCBA74B), fontSize: 24.sp)),
-                    TextStyle(color: const Color(0xffCBA74B), fontSize: 24.sp)),
           ),
         ),
         Stack(children: <Widget>[
@@ -618,16 +565,11 @@ class _LockDetailPageState extends State<LockDetailPage>
                     mainAxisAlignment: MainAxisAlignment.end,
                     children: <Widget>[
                       FlavorsImg(
-                        child: Image.asset(
+                        child: Image.asset(showElectricIcon(state.electricQuantity.value), width: 30.w, height: 24.w),
-                            showElectricIcon(state.electricQuantity.value),
-                            width: 30.w,
-                            height: 24.w),
                       ),
                       SizedBox(width: 2.w),
                       Text('${state.electricQuantity.value}%',
-                          style: TextStyle(
+                          style: TextStyle(fontSize: 18.sp, color: AppColors.darkGrayTextColor)),
-                              fontSize: 18.sp,
-                              color: AppColors.darkGrayTextColor)),
                       SizedBox(width: 2.w),
                       state.keyInfos.value.network?.isOnline == 1
                           ? Icon(
@@ -649,24 +591,17 @@ class _LockDetailPageState extends State<LockDetailPage>
                   ),
                 ),
                 Visibility(
-                  visible: state
+                  visible: state.keyInfos.value.lockFeature!.isSupportBackupBattery == 1,
-                          .keyInfos.value.lockFeature!.isSupportBackupBattery ==
-                      1,
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.end,
                     children: <Widget>[
                       FlavorsImg(
-                        child: Image.asset(
+                        child: Image.asset(showElectricIcon(state.electricQuantityStandby.value),
-                            showElectricIcon(
+                            width: 30.w, height: 24.w),
-                                state.electricQuantityStandby.value),
-                            width: 30.w,
-                            height: 24.w),
                       ),
                       SizedBox(width: 2.w),
                       Text('${state.electricQuantityStandby.value}%',
-                          style: TextStyle(
+                          style: TextStyle(fontSize: 18.sp, color: AppColors.darkGrayTextColor)),
-                              fontSize: 18.sp,
-                              color: AppColors.darkGrayTextColor)),
                       SizedBox(width: 2.w),
                       FlavorsImg(
                         child: Icon(
@@ -756,12 +691,10 @@ class _LockDetailPageState extends State<LockDetailPage>
                 right: 90.w,
                 bottom: 1,
                 child: Obx(() => Visibility(
-                    visible:
+                    visible: state.keyInfos.value.lockSetting!.remoteUnlock == 1,
-                        state.keyInfos.value.lockSetting!.remoteUnlock == 1,
                     child: GestureDetector(
                       onTap: () {
-                        ShowCupertinoAlertView().isToRemoteUnLockAlert(
+                        ShowCupertinoAlertView().isToRemoteUnLockAlert(remoteUnlockAction: () {
-                            remoteUnlockAction: () {
                           if (state.keyInfos.value.hasGateway != 1) {
                             logic.showToast('附近没有可用网关'.tr);
                           }
@@ -792,10 +725,7 @@ class _LockDetailPageState extends State<LockDetailPage>
               logic.getKeyStatusTextAndShow(),
               maxLines: 2,
               textAlign: TextAlign.center,
-              style: TextStyle(
+              style: TextStyle(fontSize: 22.sp, color: AppColors.btnDisableColor, fontWeight: FontWeight.w500),
-                  fontSize: 22.sp,
-                  color: AppColors.btnDisableColor,
-                  fontWeight: FontWeight.w500),
             ),
           ),
         ),
@@ -818,8 +748,7 @@ class _LockDetailPageState extends State<LockDetailPage>
 
   Widget adminInfoView({bool center = true, bool max = true}) {
     return Row(
-      mainAxisAlignment:
+      mainAxisAlignment: center ? MainAxisAlignment.center : MainAxisAlignment.start,
-          center ? MainAxisAlignment.center : MainAxisAlignment.start,
       children: <Widget>[
         Row(
           mainAxisSize: max ? MainAxisSize.max : MainAxisSize.min,
@@ -834,11 +763,8 @@ class _LockDetailPageState extends State<LockDetailPage>
             Text(
               state.keyInfos.value.isLockOwner == 1
                   ? '超级管理员英文'.tr
-                  : (state.keyInfos.value.keyRight == 1
+                  : (state.keyInfos.value.keyRight == 1 ? '授权管理员英文'.tr : '普通用户'.tr),
-                      ? '授权管理员英文'.tr
+              style: TextStyle(fontSize: 20.sp, color: AppColors.darkGrayTextColor),
-                      : '普通用户'.tr),
-              style: TextStyle(
-                  fontSize: 20.sp, color: AppColors.darkGrayTextColor),
             ),
             SizedBox(width: 40.w),
           ],
@@ -860,9 +786,7 @@ class _LockDetailPageState extends State<LockDetailPage>
               '网关设备英文'.tr,
               style: TextStyle(
                   fontSize: 20.sp,
-                  color: state.keyInfos.value.hasGateway == 1
+                  color: state.keyInfos.value.hasGateway == 1 ? AppColors.mainColor : AppColors.btnDisableColor),
-                      ? AppColors.mainColor
-                      : AppColors.btnDisableColor),
             ),
             SizedBox(width: 20.w),
           ],
@@ -874,18 +798,14 @@ class _LockDetailPageState extends State<LockDetailPage>
               child: Image.asset('images/main/icon_lockDetail_needNetwork.png',
                   width: 24.w,
                   height: 20.w,
-                  color: state.isOpenLockNeedOnline.value == 1
+                  color: state.isOpenLockNeedOnline.value == 1 ? AppColors.mainColor : AppColors.btnDisableColor),
-                      ? AppColors.mainColor
-                      : AppColors.btnDisableColor),
             ),
             SizedBox(width: 6.w),
             Text(
               '手机需联网英文'.tr,
               style: TextStyle(
                   fontSize: 20.sp,
-                  color: state.isOpenLockNeedOnline.value == 1
+                  color: state.isOpenLockNeedOnline.value == 1 ? AppColors.mainColor : AppColors.btnDisableColor),
-                      ? AppColors.mainColor
-                      : AppColors.btnDisableColor),
             ),
           ],
         )
@@ -893,9 +813,19 @@ class _LockDetailPageState extends State<LockDetailPage>
     );
   }
 
-  //旋转动画
+  Widget xhjBuildRotationTransition({required double width, required double height}) {
-  Widget xhjBuildRotationTransition(
+    // 只有当 animationController 不为 null 时才显示旋转动画
-      {required double width, required double height}) {
+    if (state.animationController == null) {
+      return Positioned(
+        child: Image.asset(
+          'images/icon_circle_dotted.png',
+          width: width,
+          height: height,
+          color: state.isOpenPassageMode.value == 1 ? Colors.red : AppColors.mainColor,
+        ),
+      );
+    }
+
     return Positioned(
       child: RotationTransition(
         //设置动画的旋转中心
@@ -907,17 +837,29 @@ class _LockDetailPageState extends State<LockDetailPage>
           'images/icon_circle_dotted.png',
           width: width,
           height: height,
-          color: state.isOpenPassageMode.value == 1
+          color: state.isOpenPassageMode.value == 1 ? Colors.red : AppColors.mainColor,
-              ? Colors.red
+        ),
-              : AppColors.mainColor,
+      ),
+    );
+  }
+
+//旋转动画
+  Widget buildRotationTransition({required double width, required double height}) {
+    // 如果动画控制器未初始化，则不显示动画
+    if (state.animationController == null) {
+      return Positioned(
+        child: FlavorsImg(
+          child: Image.asset(
+            state.isOpenPassageMode.value == 1
+                ? 'images/main/icon_main_normallyOpenMode_circle.png'
+                : 'images/main/icon_main_openLockBtn_circle.png',
+            width: width,
+            height: height,
           ),
         ),
       );
     }
 
-  //旋转动画
-  Widget buildRotationTransition(
-      {required double width, required double height}) {
     return Positioned(
       child: RotationTransition(
         //设置动画的旋转中心
@@ -949,9 +891,7 @@ class _LockDetailPageState extends State<LockDetailPage>
           margin: EdgeInsets.symmetric(vertical: 10.0.w, horizontal: 6.0.w),
           decoration: BoxDecoration(
             shape: BoxShape.circle,
-            color: state.currentPage.value == index
+            color: state.currentPage.value == index ? AppColors.mainColor : Colors.grey,
-                ? AppColors.mainColor
-                : Colors.grey,
           ),
         );
       }),
@@ -997,8 +937,7 @@ class _LockDetailPageState extends State<LockDetailPage>
     //     '开门器', state.bottomBtnisUneable.value, () {}));
 
     // 新增配件
-    showWidgetArr.add(bottomItem('images/main/icon_main_addLock.png', '新增配件'.tr,
+    showWidgetArr.add(bottomItem('images/main/icon_main_addLock.png', '新增配件'.tr, state.bottomBtnisEable.value, () {
-        state.bottomBtnisEable.value, () {
       Navigator.pushNamed(context, Routers.accessoriesListPage);
     }));
 
@@ -1015,8 +954,7 @@ class _LockDetailPageState extends State<LockDetailPage>
             crossAxisSpacing: 0.h,
             mainAxisExtent: 90.0, // 设置每个 item 的固定高度
           ),
-          itemCount: (state.keyInfos.value.isLockOwner == 1 ||
+          itemCount: (state.keyInfos.value.isLockOwner == 1 || state.keyInfos.value.keyRight == 1)
-                  state.keyInfos.value.keyRight == 1)
               ? getAllWidget().length
               : getNormalWidget().length,
           itemBuilder: (context, index) {
@@ -1041,8 +979,7 @@ class _LockDetailPageState extends State<LockDetailPage>
 
   // 根据权限显示不同的底部按钮
   List<Widget> getBottomWidget() {
-    if (state.keyInfos.value.isLockOwner == 1 ||
+    if (state.keyInfos.value.isLockOwner == 1 || state.keyInfos.value.keyRight == 1) {
-        state.keyInfos.value.keyRight == 1) {
       // 超级管理员、授权管理员
       return getAllWidget();
     } else {
@@ -1062,22 +999,17 @@ class _LockDetailPageState extends State<LockDetailPage>
     //   }));
     // }
     // 操作记录
-    showWidgetArr.add(bottomItem('images/main/icon_main_operatingRecord.png',
+    showWidgetArr
-        '操作记录'.tr, state.bottomBtnisEable.value, () {
+        .add(bottomItem('images/main/icon_main_operatingRecord.png', '操作记录'.tr, state.bottomBtnisEable.value, () {
       Get.toNamed(Routers.doorLockLogPage,
-          arguments: <String, LockListInfoItemEntity>{
+          arguments: <String, LockListInfoItemEntity>{'keyInfo': state.keyInfos.value});
-            'keyInfo': state.keyInfos.value
-          });
     }));
 
     // 设置
     if (F.isSKY) {
-      showWidgetArr
+      showWidgetArr.add(bottomItem('images/main/icon_main_set.png', '设置'.tr, true, () {
-          .add(bottomItem('images/main/icon_main_set.png', '设置'.tr, true, () {
+        Get.toNamed(Routers.lockSetPage,
-        Get.toNamed(Routers.lockSetPage, arguments: <String, Object?>{
+            arguments: <String, Object?>{'lockId': state.keyInfos.value.lockId, 'isOnlyOneData': state.isOnlyOneData});
-          'lockId': state.keyInfos.value.lockId,
-          'isOnlyOneData': state.isOnlyOneData
-        });
       }));
     }
 
@@ -1097,26 +1029,22 @@ class _LockDetailPageState extends State<LockDetailPage>
     // }
 
     // 电子钥匙
-    showWidgetArr.add(bottomItem('images/main/icon_main_electronicKey.png',
+    showWidgetArr
-        '电子钥匙'.tr, state.bottomBtnisEable.value, () {
+        .add(bottomItem('images/main/icon_main_electronicKey.png', '电子钥匙'.tr, state.bottomBtnisEable.value, () {
       Get.toNamed(Routers.electronicKeyListPage);
     }));
 
     // 密码
     if (state.keyInfos.value.lockFeature!.password == 1) {
-      showWidgetArr.add(bottomItem('images/main/icon_main_password.png',
+      showWidgetArr.add(bottomItem('images/main/icon_main_password.png', '密码'.tr, state.bottomBtnisEable.value, () {
-          '密码'.tr, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.passwordKeyListPage,
-            arguments: <String, LockListInfoItemEntity>{
+            arguments: <String, LockListInfoItemEntity>{'keyInfo': state.keyInfos.value});
-              'keyInfo': state.keyInfos.value
-            });
       }));
     }
 
     // ic卡
     if (state.keyInfos.value.lockFeature!.icCard == 1) {
-      showWidgetArr.add(bottomItem('images/main/icon_main_icCard.png', '卡'.tr,
+      showWidgetArr.add(bottomItem('images/main/icon_main_icCard.png', '卡'.tr, state.bottomBtnisEable.value, () {
-          state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.cardListPage, arguments: <String, int?>{
           'lockId': state.keyInfos.value.lockId,
         });
@@ -1125,8 +1053,7 @@ class _LockDetailPageState extends State<LockDetailPage>
 
     // 指纹
     if (state.keyInfos.value.lockFeature!.fingerprint == 1) {
-      showWidgetArr.add(bottomItem('images/main/icon_main_fingerprint.png',
+      showWidgetArr.add(bottomItem('images/main/icon_main_fingerprint.png', '指纹'.tr, state.bottomBtnisEable.value, () {
-          '指纹'.tr, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.fingerprintListPage, arguments: <String, int?>{
           'lockId': state.keyInfos.value.lockId,
         });
@@ -1135,8 +1062,8 @@ class _LockDetailPageState extends State<LockDetailPage>
 
     // 遥控
     if (state.keyInfos.value.lockFeature!.bluetoothRemoteControl == 1) {
-      showWidgetArr.add(bottomItem('images/main/icon_main_remoteControl.png',
+      showWidgetArr
-          '遥控'.tr, state.bottomBtnisEable.value, () {
+          .add(bottomItem('images/main/icon_main_remoteControl.png', '遥控'.tr, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.remoteControlListPage, arguments: <String, int?>{
           'lockId': state.keyInfos.value.lockId,
         });
@@ -1146,9 +1073,7 @@ class _LockDetailPageState extends State<LockDetailPage>
     //可视对讲门锁新增->人脸
     if (state.keyInfos.value.lockFeature!.d3Face == 1) {
       showWidgetArr.add(
-        bottomItem(
+        bottomItem('images/main/icon_face.png', '人脸'.tr, state.bottomBtnisEable.value, () {
-            'images/main/icon_face.png', '人脸'.tr, state.bottomBtnisEable.value,
-            () {
           Get.toNamed(Routers.faceListPage, arguments: <String, int?>{
             'lockId': state.keyInfos.value.lockId,
           });
@@ -1158,9 +1083,7 @@ class _LockDetailPageState extends State<LockDetailPage>
 
     if (state.keyInfos.value.lockFeature!.isSupportIris == 1) {
       showWidgetArr.add(
-        bottomItem(
+        bottomItem('images/main/icon_iris.png', '虹膜'.tr, state.bottomBtnisEable.value, () {
-            'images/main/icon_iris.png', '虹膜'.tr, state.bottomBtnisEable.value,
-            () {
           Get.toNamed(Routers.irisListPage, arguments: <String, int?>{
             'lockId': state.keyInfos.value.lockId,
           });
@@ -1170,9 +1093,7 @@ class _LockDetailPageState extends State<LockDetailPage>
 
     if (state.keyInfos.value.lockFeature!.palmVein == 1) {
       showWidgetArr.add(
-        bottomItem(
+        bottomItem('images/main/icon_palm.png', '掌静脉'.tr, state.bottomBtnisEable.value, () {
-            'images/main/icon_palm.png', '掌静脉'.tr, state.bottomBtnisEable.value,
-            () {
           Get.toNamed(Routers.palmListPage, arguments: <String, int?>{
             'lockId': state.keyInfos.value.lockId,
           });
@@ -1183,8 +1104,7 @@ class _LockDetailPageState extends State<LockDetailPage>
     //可视对讲门锁新增->监控
     if (state.keyInfos.value.lockFeature!.isSupportCatEye == 1) {
       showWidgetArr.add(
-        bottomItem('images/main/icon_catEyes.png', '监控'.tr,
+        bottomItem('images/main/icon_catEyes.png', '监控'.tr, state.bottomBtnisEable.value, () async {
-            state.bottomBtnisEable.value, () async {
           logic.sendMonitorMessage();
         }),
       );
@@ -1192,33 +1112,28 @@ class _LockDetailPageState extends State<LockDetailPage>
 
     // 授权管理员
     if (state.keyInfos.value.isLockOwner == 1) {
-      showWidgetArr.add(bottomItem('images/main/icon_main_authorizedAdmin.png',
+      showWidgetArr
-          '授权管理员'.tr, state.bottomBtnisEable.value, () {
+          .add(bottomItem('images/main/icon_main_authorizedAdmin.png', '授权管理员'.tr, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.authorizedAdminListPage,
-            arguments: <String, LockListInfoItemEntity>{
+            arguments: <String, LockListInfoItemEntity>{'keyInfo': state.keyInfos.value});
-              'keyInfo': state.keyInfos.value
-            });
       }));
     }
 
     final List<Widget> endWiddget = <Widget>[];
     endWiddget.add(
       // 操作记录
-      bottomItem('images/main/icon_main_operatingRecord.png', '操作记录'.tr,
+      bottomItem('images/main/icon_main_operatingRecord.png', '操作记录'.tr, state.bottomBtnisEable.value, () {
-          state.bottomBtnisEable.value, () {
         // Get.toNamed(Routers.lockOperatingRecordPage,
         //     arguments: {"keyInfo": state.keyInfos.value});
         Get.toNamed(Routers.doorLockLogPage,
-            arguments: <String, LockListInfoItemEntity>{
+            arguments: <String, LockListInfoItemEntity>{'keyInfo': state.keyInfos.value});
-              'keyInfo': state.keyInfos.value
-            });
       }),
     );
 
     if (state.keyInfos.value.lockFeature!.isSupportCatEye == 1) {
       //视频日志
-      endWiddget.add(bottomItem('images/main/icon_lockDetail_videoLog.png',
+      endWiddget
-          '视频日志'.tr, state.bottomBtnisEable.value, () {
+          .add(bottomItem('images/main/icon_lockDetail_videoLog.png', '视频日志'.tr, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.videoLogPage, arguments: <String, int?>{
           'lockId': state.keyInfos.value.lockId,
         });
@@ -1227,12 +1142,10 @@ class _LockDetailPageState extends State<LockDetailPage>
     if (!F.isProductionEnv) {
       endWiddget.add(
         // 消息提醒
-        bottomItem('images/main/icon_lockDetail_messageReminding.png',
+        bottomItem('images/main/icon_lockDetail_messageReminding.png', '消息提醒'.tr, state.bottomBtnisEable.value, () {
-            '消息提醒'.tr, state.bottomBtnisEable.value, () {
           Get.toNamed(Routers.msgNotificationPage, arguments: <String, int?>{
             'lockId': state.keyInfos.value.lockId,
-            'isSupportCatEye':
+            'isSupportCatEye': state.keyInfos.value.lockFeature!.isSupportCatEye,
-                state.keyInfos.value.lockFeature!.isSupportCatEye,
           });
         }),
       );
@@ -1254,8 +1167,7 @@ class _LockDetailPageState extends State<LockDetailPage>
     return showWidgetArr;
   }
 
-  Widget bottomItem(
+  Widget bottomItem(String iconUrl, String name, bool bottomBtnisEable, Function() onClick) {
-      String iconUrl, String name, bool bottomBtnisEable, Function() onClick) {
     final Widget child = F.sw(
         skyCall: () => Container(
               color: Colors.white,
@@ -1268,9 +1180,7 @@ class _LockDetailPageState extends State<LockDetailPage>
                     child: Image.asset(iconUrl,
                         width: 42.w,
                         height: 42.w,
-                        color: bottomBtnisEable
+                        color: bottomBtnisEable ? AppColors.mainColor : AppColors.lockDetailBottomBtnUneable,
-                            ? AppColors.mainColor
-                            : AppColors.lockDetailBottomBtnUneable,
                         fit: BoxFit.fitWidth),
                   ),
                   SizedBox(height: 5.h),
@@ -1278,9 +1188,7 @@ class _LockDetailPageState extends State<LockDetailPage>
                       child: Text(name,
                           style: TextStyle(
                               fontSize: 20.sp,
-                              color: bottomBtnisEable
+                              color: bottomBtnisEable ? AppColors.blackColor : AppColors.lockDetailBottomBtnUneable),
-                                  ? AppColors.blackColor
-                                  : AppColors.lockDetailBottomBtnUneable),
                           textAlign: TextAlign.center))
                 ],
               ),
@@ -1298,9 +1206,7 @@ class _LockDetailPageState extends State<LockDetailPage>
                     child: Image.asset(iconUrl,
                         width: 42.w,
                         height: 42.w,
-                        color: bottomBtnisEable
+                        color: bottomBtnisEable ? AppColors.mainColor : AppColors.lockDetailBottomBtnUneable,
-                            ? AppColors.mainColor
-                            : AppColors.lockDetailBottomBtnUneable,
                         fit: BoxFit.fitWidth),
                   ),
                   SizedBox(height: 15.h),
@@ -1313,9 +1219,7 @@ class _LockDetailPageState extends State<LockDetailPage>
                     style: TextStyle(
                         fontSize: 20.sp,
                         height: 1.0,
-                        color: bottomBtnisEable
+                        color: bottomBtnisEable ? AppColors.blackColor : AppColors.lockDetailBottomBtnUneable),
-                            ? AppColors.blackColor
-                            : AppColors.lockDetailBottomBtnUneable),
                   ),
                 ],
               ),
@@ -1347,18 +1251,14 @@ class _LockDetailPageState extends State<LockDetailPage>
 
   Widget _unlockSuccessWidget() {
     String lockAlias = state.keyInfos.value.lockAlias!;
-    final TextStyle lockAliasTextStyle =
+    final TextStyle lockAliasTextStyle = TextStyle(color: AppColors.placeholderTextColor, fontSize: 24.sp);
-        TextStyle(color: AppColors.placeholderTextColor, fontSize: 24.sp);
     final TextPainter textPainter = TextPainter(
-        text: TextSpan(text: lockAlias, style: lockAliasTextStyle),
+        text: TextSpan(text: lockAlias, style: lockAliasTextStyle), maxLines: 1, textDirection: TextDirection.ltr)
-        maxLines: 1,
-        textDirection: TextDirection.ltr)
       ..layout(minWidth: 0, maxWidth: double.infinity);
 
     final double textSizeWidth = textPainter.size.width; // 获取文本的尺寸
     if (textSizeWidth > 358.w * 2 - 20) {
-      lockAlias =
+      lockAlias = '${lockAlias.substring(0, lockAlias.length > 25 ? 25 : lockAlias.length)}...';
-          '${lockAlias.substring(0, lockAlias.length > 25 ? 25 : lockAlias.length)}...';
     }
     return Center(
       child: Stack(
@@ -1378,17 +1278,13 @@ class _LockDetailPageState extends State<LockDetailPage>
                   Text(state.iSOpenLock.value == true ? '已开锁'.tr : '已闭锁'.tr,
                       maxLines: 2,
                       overflow: TextOverflow.ellipsis,
-                      style: TextStyle(
+                      style: TextStyle(color: AppColors.mainColor, fontSize: 32.sp, fontWeight: FontWeight.w600)),
-                          color: AppColors.mainColor,
-                          fontSize: 32.sp,
-                          fontWeight: FontWeight.w600)),
                   SizedBox(
                     height: 10.h,
                   ),
                   Text(
                     lockAlias,
-                    style: TextStyle(
+                    style: TextStyle(color: AppColors.placeholderTextColor, fontSize: 24.sp),
-                        color: AppColors.placeholderTextColor, fontSize: 24.sp),
                     maxLines: 2,
                   ),
                   SizedBox(
@@ -1396,8 +1292,7 @@ class _LockDetailPageState extends State<LockDetailPage>
                   ),
                   Text(
                     getCurrentFormattedTime(),
-                    style: TextStyle(
+                    style: TextStyle(color: AppColors.darkGrayTextColor, fontSize: 24.sp),
-                        color: AppColors.darkGrayTextColor, fontSize: 24.sp),
                   )
                 ],
               )),
@@ -1468,7 +1363,7 @@ class _LockDetailPageState extends State<LockDetailPage>
     // }
     state.iSOpenLock.value = true;
     state.openLockBtnState.value = 1;
-    state.animationController!.forward();
+    state.animationController?.forward();
     AppLog.log('点击开锁');
     if (isOpenLockNeedOnline) {
       // 不需要联网
@@ -1476,10 +1371,7 @@ class _LockDetailPageState extends State<LockDetailPage>
       // AppLog.log('点击开锁 state.openDoorModel = 0 不需要联网');
       // FlutterBuglyPlugin.reportException(exceptionName: '点击了不需要联网开锁');
       BuglyTool.uploadException(
-          message: '点击了不需要联网开锁',
+          message: '点击了不需要联网开锁', detail: '点击了不需要联网开锁 openDoorModel:${state.openDoorModel}', upload: false, begin: true);
-          detail: '点击了不需要联网开锁 openDoorModel:${state.openDoorModel}',
-          upload: false,
-          begin: true);
       AppLog.log('点击开锁 state.openDoorModel = 0 不需要联网');
       logic.openDoorAction();
     } else {
@@ -1488,10 +1380,7 @@ class _LockDetailPageState extends State<LockDetailPage>
       // AppLog.log('点击开锁 state.openDoorModel = 2 需要联网');
       // FlutterBuglyPlugin.reportException(exceptionName: '点击了需要联网开锁');
       BuglyTool.uploadException(
-          message: '点击了需要联网开锁',
+          message: '点击了需要联网开锁', detail: '点击了需要联网开锁  openDoorModel:${state.openDoorModel}', upload: false, begin: true);
-          detail: '点击了需要联网开锁  openDoorModel:${state.openDoorModel}',
-          upload: false,
-          begin: true);
       AppLog.log('点击开锁 state.openDoorModel = 2 需要联网');
       logic.getLockNetToken();
     }
@@ -1503,7 +1392,7 @@ class _LockDetailPageState extends State<LockDetailPage>
     }
     state.iSOpenLock.value = false;
     state.openLockBtnState.value = 1;
-    state.animationController!.forward();
+    state.animationController?.forward();
     EasyLoading.showToast('正在尝试闭锁……'.tr, duration: 1000.milliseconds);
     AppLog.log('长按闭锁');
     if (state.isOpenLockNeedOnline.value == 0) {
@@ -1526,11 +1415,10 @@ class _LockDetailPageState extends State<LockDetailPage>
     state.closedUnlockSuccessfulTimer?.cancel();
     _lockRefreshLockDetailInfoDataEvent?.cancel();
     state.replySubscription.cancel();
-    state.lockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceEvent
+    state.lockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceEvent?.cancel();
-        ?.cancel();
     state.LockSetChangeSetRefreshLockDetailWithTypeSubscription?.cancel();
     if (state.animationController != null) {
-      state.animationController!.dispose();
+      state.animationController?.dispose();
       state.animationController = null;
     }
     super.dispose();

lib/main/lockDetail/lockSet/aiAssistant/ai_assistant_logic.dart

@@ -0,0 +1,7 @@
+import 'package:star_lock/main/lockDetail/lockSet/aiAssistant/ai_assistant_state.dart';
+import 'package:star_lock/tools/baseGetXController.dart';
+
+class AiAssistantLogic extends BaseGetXController{
+  final AiAssistantState state = AiAssistantState();
+
+}

lib/main/lockDetail/lockSet/aiAssistant/ai_assistant_page.dart

@@ -0,0 +1,90 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:star_lock/app_settings/app_colors.dart';
+import 'package:star_lock/main/lockDetail/lockSet/aiAssistant/ai_assistant_logic.dart';
+import 'package:star_lock/main/lockDetail/lockSet/aiAssistant/ai_assistant_state.dart';
+import 'package:star_lock/tools/commonItem.dart';
+import 'package:star_lock/tools/titleAppBar.dart';
+
+class AiAssistantPage extends StatefulWidget {
+  const AiAssistantPage({Key? key}) : super(key: key);
+
+  @override
+  State<AiAssistantPage> createState() => _AiAssistantPageState();
+}
+
+class _AiAssistantPageState extends State<AiAssistantPage> {
+  final AiAssistantLogic logic = Get.put(AiAssistantLogic());
+  final AiAssistantState state = Get.find<AiAssistantLogic>().state;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: TitleAppBar(barTitle: 'AI助理设置'.tr, haveBack: true, backgroundColor: AppColors.mainColor),
+      body: Container(
+        width: 1.sw,
+        padding: EdgeInsets.symmetric(horizontal: 20.w),
+        margin: EdgeInsets.only(top: 20.h),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Image.asset(
+              'images/other/ai.png',
+              height: 250.h,
+              fit: BoxFit.cover,
+            ),
+            SizedBox(
+              height: 50.h,
+            ),
+            Text(
+              'AI助理的支持依赖网络授权下载，打开功能开关时请保证手机数据网络的正常连接'.tr,
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                fontSize: 20.sp,
+                color: Colors.grey,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+            SizedBox(
+              height: 50.h,
+            ),
+            CommonItem(
+              leftTitel: 'Ai语音菜单'.tr,
+              rightTitle: '',
+              isHaveLine: true,
+              // 最后一个元素不显示分割线（取反）
+              isHaveDirection: false,
+              isHaveRightWidget: true,
+              rightWidget: CupertinoSwitch(
+                value: false,
+                onChanged: (value) {},
+              ),
+              action: () {
+                logic.showToast('功能待开放'.tr);
+              },
+            ),
+            CommonItem(
+              leftTitel: 'Ai智能语音交互'.tr,
+              rightTitle: '',
+              isHaveLine: false,
+              // 最后一个元素不显示分割线（取反）
+              isHaveDirection: false,
+              isHaveRightWidget: true,
+              rightWidget: CupertinoSwitch(
+                value: false,
+                onChanged: (value) {},
+              ),
+              action: () {
+                logic.showToast('功能待开放'.tr);
+              },
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/main/lockDetail/lockSet/aiAssistant/ai_assistant_state.dart

@@ -0,0 +1,12 @@
+import 'package:get/get.dart';
+import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
+
+class AiAssistantState {
+  AiAssistantState() {
+    final map = Get.arguments;
+    lockSetInfoData.value = map['lockSetInfoData'];
+  }
+
+  Rx<LockSetInfoData> lockSetInfoData = LockSetInfoData().obs;
+
+}

lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart

@@ -35,10 +35,7 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
   Widget build(BuildContext context) {
     return Scaffold(
         backgroundColor: AppColors.mainBackgroundColor,
-        appBar: TitleAppBar(
+        appBar: TitleAppBar(barTitle: '基本信息'.tr, haveBack: true, backgroundColor: AppColors.mainColor),
-            barTitle: '基本信息'.tr,
-            haveBack: true,
-            backgroundColor: AppColors.mainColor),
         body: ListView(
           children: <Widget>[
             Obx(() => CommonItem(
@@ -48,8 +45,7 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
                 isHaveLine: true)),
             Obx(() => CommonItem(
                 leftTitel: 'MAC/ID',
-                rightTitle:
+                rightTitle: "${state.lockBasicInfo.value.mac ?? ""}/${state.lockBasicInfo.value.lockId ?? ""}",
-                    "${state.lockBasicInfo.value.mac ?? ""}/${state.lockBasicInfo.value.lockId ?? ""}",
                 allHeight: 70.h,
                 isHaveLine: true)),
             // Obx(() => CommonItem(
@@ -67,22 +63,17 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
             ),
             Obx(() => CommonItem(
                 leftTitel: '电量'.tr,
-                rightTitle:
+                rightTitle: '${state.lockBasicInfo.value.electricQuantity ?? 0}%',
-                    '${state.lockBasicInfo.value.electricQuantity ?? 0}%',
                 isHaveLine: true,
                 isHaveDirection: true,
                 action: () {
                   Get.toNamed(Routers.uploadElectricQuantityPage,
-                      arguments: <String, LockSetInfoData>{
+                      arguments: <String, LockSetInfoData>{'lockSetInfoData': state.lockSetInfoData.value});
-                        'lockSetInfoData': state.lockSetInfoData.value
-                      });
                 })),
             Obx(() => CommonItem(
                 leftTitel: '有效期'.tr,
-                rightTitle: logic.getUseKeyTypeStr(
+                rightTitle: logic.getUseKeyTypeStr(state.lockBasicInfo.value.startDate,
-                    state.lockBasicInfo.value.startDate,
+                    state.lockBasicInfo.value.endDate, state.lockBasicInfo.value.keyType),
-                    state.lockBasicInfo.value.endDate,
-                    state.lockBasicInfo.value.keyType),
                 allHeight: 70.h,
                 isHaveLine: true)),
             Obx(() => Visibility(
@@ -104,28 +95,19 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
                 )),
             SizedBox(height: 10.h),
             Obx(() => Visibility(
-                visible: state.lockBasicInfo.value.isLockOwner == 1 ||
+                visible: state.lockBasicInfo.value.isLockOwner == 1 || state.lockBasicInfo.value.keyRight == 1,
-                    state.lockBasicInfo.value.keyRight == 1,
+                child: lockDataListItem('名称'.tr, state.lockBasicInfo.value.lockAlias ?? '', () async {
-                child: lockDataListItem(
-                    '名称'.tr, state.lockBasicInfo.value.lockAlias ?? '',
-                    () async {
                   var data = await Get.toNamed(Routers.editLockNamePage,
-                      arguments: <String, LockSetInfoData>{
+                      arguments: <String, LockSetInfoData>{'lockSetInfoData': state.lockSetInfoData.value});
-                        'lockSetInfoData': state.lockSetInfoData.value
-                      });
                   if (data != null) {
                     setState(() {
                       state.lockBasicInfo.value = data['lockBasicInfo'];
                     });
                   }
                 }))),
-            Obx(() => lockDataListItem(
+            Obx(() => lockDataListItem('锁分组'.tr, state.lockBasicInfo.value.groupName ?? '', () async {
-                    '锁分组'.tr, state.lockBasicInfo.value.groupName ?? '',
-                    () async {
                   Get.toNamed(Routers.lockSelectGroupingPage,
-                          arguments: <String, LockSetInfoData>{
+                          arguments: <String, LockSetInfoData>{'lockSetInfoData': state.lockSetInfoData.value})!
-                        'lockSetInfoData': state.lockSetInfoData.value
-                      })!
                       .then((val) {
                     if (val != null) {
                       // mockNetworkDataRequest();
@@ -142,22 +124,41 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
                       isHaveDirection: true,
                       action: () {
                         Get.toNamed(Routers.adminOpenLockPasswordPage,
-                            arguments: <String, LockSetInfoData>{
+                            arguments: <String, LockSetInfoData>{'lockSetInfoData': state.lockSetInfoData.value});
-                              'lockSetInfoData': state.lockSetInfoData.value
-                            });
                       }),
                 )),
-            Obx(() => Visibility(
+            Obx(
-                  visible: (state.lockBasicInfo.value.lockName ?? '')
+              () => Visibility(
-                      .contains('T9A'),
+                visible: state.lockSetInfoData.value.lockFeature?.wifi == 1,
                 child: CommonItem(
                     leftTitel: '当前网络'.tr,
-                      rightTitle:
+                    rightTitle: state.lockBasicInfo.value.networkInfo?.wifiName ?? '-',
-                          state.lockBasicInfo.value.networkInfo?.wifiName ??
-                              '-',
                     allHeight: 70.h,
                     isHaveLine: true),
-                )),
+              ),
+            ),
+            Obx(
+              () => Visibility(
+                visible: state.lockSetInfoData.value.lockFeature?.wifi == 1,
+                child: CommonItem(
+                  leftTitel: '网络信号强度'.tr,
+                  rightTitle: '-',
+                  allHeight: 70.h,
+                  isHaveLine: true,
+                ),
+              ),
+            ),
+            Obx(
+              () => Visibility(
+                visible: state.lockSetInfoData.value.lockFeature?.wifi == 1,
+                child: CommonItem(
+                  leftTitel: '设备时区'.tr,
+                  rightTitle: '-',
+                  allHeight: 70.h,
+                  isHaveLine: true,
+                ),
+              ),
+            ),
             // Obx(() => CommonItem(
             //       leftTitel: '位置信息'.tr,
             //       // rightTitle: state.lockBasicInfo.value.address ?? "-",
@@ -190,14 +191,12 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
         ));
   }
 
-  Widget lockDataListItem(
+  Widget lockDataListItem(String leftTitle, String conentStr, Function()? action) {
-      String leftTitle, String conentStr, Function()? action) {
     return GestureDetector(
       onTap: action,
       child: Container(
         // height: 70.h,
-        padding:
+        padding: EdgeInsets.only(left: 20.w, right: 10.w, top: 15.h, bottom: 15.h),
-            EdgeInsets.only(left: 20.w, right: 10.w, top: 15.h, bottom: 15.h),
         decoration: BoxDecoration(
             color: Colors.white,
             border: Border(

lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart

@@ -553,6 +553,19 @@ class _LockSetPageState extends State<LockSetPage>
               });
         },
       ),
+      // 锁语音包设置
+      CommonItem(
+        leftTitel: 'AI助理'.tr,
+        rightTitle: '',
+        isHaveLine: true,
+        isHaveDirection: true,
+        action: () {
+          Get.toNamed(Routers.aiAssistant,
+              arguments: <String, LockSetInfoData>{
+                'lockSetInfoData': state.lockSetInfoData.value
+              });
+        },
+      ),
       // 蓝牙广播（关闭则不能使用蓝牙主动开锁）
       /* 2024-01-12 会议确定去掉“蓝牙广播” by DaisyWu
       Obx(() => Visibility(

lib/main/lockDetail/lockSet/lockTime/lockTime_logic.dart

@@ -26,8 +26,7 @@ class LockTimeLogic extends BaseGetXController {
   late StreamSubscription<Reply> _replySubscription;
 
   void _initReplySubscription() {
-    _replySubscription =
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
-        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
       if (reply is TimingReply) {
         _replyTiming(reply);
       }
@@ -50,10 +49,8 @@ class LockTimeLogic extends BaseGetXController {
 
         // 有效时间
         final List<int> indate = reply.data.sublist(150, 154);
-        int indateValue = (0xff & indate[0]) << 24 |
+        int indateValue =
-            (0xff & indate[1]) << 16 |
+            (0xff & indate[0]) << 24 | (0xff & indate[1]) << 16 | (0xff & indate[2]) << 8 | (0xFF & indate[3]);
-            (0xff & indate[2]) << 8 |
-            (0xFF & indate[3]);
         // 检查时间戳是否无效或超出范围
         if (indateValue == 0xffffffff || indateValue <= 0) {
           // 使用当前系统时间戳（秒）
@@ -62,23 +59,19 @@ class LockTimeLogic extends BaseGetXController {
         }
 
         // 验证时间戳是否在合理范围内（例如：2000年到2100年之间）
-        final DateTime dateTime =
+        final DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(indateValue * 1000);
-            DateTime.fromMillisecondsSinceEpoch(indateValue * 1000);
         if (dateTime.year < 2000 || dateTime.year > 2100) {
           AppLog.log('时间戳超出合理范围: $indateValue');
           indateValue = DateTime.now().millisecondsSinceEpoch ~/ 1000;
         }
 
-        AppLog.log(
+        AppLog.log('====================indate:$indate indateValue:$indateValue');
-            '====================indate:$indate indateValue:$indateValue');
         state.dateTime.value = DateTool().dateToYMDHNString('$indateValue');
         break;
       case 0x06:
         //需要鉴权
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
-            changeStringListToIntList(privateKey!);
 
         IoSenderManage.senderGetStarLockStatuInfo(
           lockID: BlueManage().connectDeviceName,
@@ -101,8 +94,7 @@ class LockTimeLogic extends BaseGetXController {
     switch (status) {
       case 0x00:
         //成功
-        final String dataEime =
+        final String dataEime = DateTool().dateToYMDHNString('${state.serverTime}');
-            DateTool().dateToYMDHNString('${state.serverTime}');
 
         state.dateTime.value = dataEime;
 
@@ -149,19 +141,15 @@ class LockTimeLogic extends BaseGetXController {
       dismissEasyLoading();
       state.sureBtnState.value = 0;
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
-            changeStringListToIntList(privateKey!);
 
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
 
-        final List<String>? signKey =
+        final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
-            await Storage.getStringList(saveBlueSignKey);
         final List<int> getSignKeyList = changeStringListToIntList(signKey!);
 
         IoSenderManage.senderTimingCommand(
@@ -190,13 +178,10 @@ class LockTimeLogic extends BaseGetXController {
     showBlueConnetctToastTimer(action: () {
       dismissEasyLoading();
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
-        (BluetoothConnectionState deviceConnectionState) async {
       if (deviceConnectionState == BluetoothConnectionState.connected) {
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
-            changeStringListToIntList(privateKey!);
 
         IoSenderManage.senderGetStarLockStatuInfo(
           lockID: BlueManage().connectDeviceName,
@@ -206,8 +191,7 @@ class LockTimeLogic extends BaseGetXController {
           isBeforeAddUser: false,
           privateKey: getPrivateKeyList,
         );
-      } else if (deviceConnectionState ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
         // if (state.ifCurrentScreen.value == true) {
@@ -219,8 +203,7 @@ class LockTimeLogic extends BaseGetXController {
 
   // 从网关获取时间
   Future<void> getLockTimeFromGateway() async {
-    final GetServerDatetimeEntity entity =
+    final GetServerDatetimeEntity entity = await ApiRepository.to.getLockTimeFromGateway(
-        await ApiRepository.to.getLockTimeFromGateway(
       lockId: state.lockSetInfoData.value.lockId.toString(),
     );
     if (entity.errorCode!.codeIsSuccessful) {}
@@ -228,10 +211,10 @@ class LockTimeLogic extends BaseGetXController {
 
   // 从服务器获取锁的时间 开锁时传入
   Future<void> getServerDatetime(bool isSendTime) async {
-    final GetServerDatetimeEntity entity =
+    final GetServerDatetimeEntity entity = await ApiRepository.to.getServerDatetimeData(isUnShowLoading: false);
-        await ApiRepository.to.getServerDatetimeData(isUnShowLoading: false);
     if (entity.errorCode!.codeIsSuccessful) {
       state.serverTime = entity.data!.date! ~/ 1000;
+      AppLog.log('msg:${state.serverTime}');
       // AppLog.log("entity.data!.date! ~/ 1000:${entity.data!.date! ~/ 1000} DateTime.now().millisecondsSinceEpoch ~/ 1000:${DateTime.now().millisecondsSinceEpoch ~/ 1000} 服务器时间差:${state.differentialTime}");
       if (isSendTime == false) {
         getStarLockStatus();

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 =
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
-        EventBusManager().eventBus!.on<Reply>().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 =
+      final PassthroughListResponse entity = await ApiRepository.to.getPassthroughList(data: {
-          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:
+              langText: ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle,
-                  ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle,
               name: element.name,
             );
             state.languages.add(passthroughItem);
           }
         });
         state.languages.refresh();
-        final lang = state
+        final lang = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang;
-            .lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang;
+        final timbre = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre;
-        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
+        final indexWhere = state.languages.indexWhere((element) => element.lang == currentLocale.toString());
-            .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,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
-        (BluetoothConnectionState deviceConnectionState) async {
       if (deviceConnectionState == BluetoothConnectionState.connected) {
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
+        final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
-            changeStringListToIntList(privateKey!);
-        final List<String>? signKey =
-            await Storage.getStringList(saveBlueSignKey);
         final List<int> 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 ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
       }
@@ -233,16 +222,14 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
     showBlueConnetctToastTimer(action: () {
       dismissEasyLoading();
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
-        (BluetoothConnectionState deviceConnectionState) async {
       if (deviceConnectionState == BluetoothConnectionState.connected) {
         BlueManage().writeCharacteristicWithResponse(
           GetDeviceModelCommand(
             lockID: BlueManage().connectDeviceName,
           ).packageData(),
         );
-      } else if (deviceConnectionState ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
         showBlueConnetctToast();
@@ -251,8 +238,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
   }
 
   // 开始配置语音包
-  void _handlerStartVoicePackageConfigure(
+  void _handlerStartVoicePackageConfigure(VoicePackageConfigureReply reply) async {
-      VoicePackageConfigureReply reply) async {
     final int status = reply.data[6];
     switch (status) {
       case 0x00:
@@ -271,7 +257,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
         }
         break;
       default:
-        showToast('获取设备型号失败'.tr);
+        // showToast('获取设备型号失败'.tr);
         break;
     }
   }
@@ -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.data!.length + state.voiceSubcontractingSize - 1) ~/ state.voiceSubcontractingSize;
-            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.progress.value = (state.voiceSubcontractingIndex + 1) / state.voiceSubcontractingCount;
-        (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(
+  _sendLanguageFileBleMessage({required int index, required Uint8List data}) async {
-      {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 ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
-        showBlueConnetctToast();
+        // showBlueConnetctToast();
       }
     });
   }
 
-  void _handlerVoicePackageConfigureProcess(
+  void _handlerVoicePackageConfigureProcess(VoicePackageConfigureProcessReply reply) {
-      VoicePackageConfigureProcessReply reply) {
     // 取消超时定时器（已收到回复，无需继续等待）
     _sendTimeoutTimer?.cancel();
     _isTimeout = false; // 重置超时标志
@@ -431,8 +412,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
     });
   }
 
-  Future<void> _executeLogic(
+  Future<void> _executeLogic(VoicePackageConfigureConfirmationReply reply) async {
-      VoicePackageConfigureConfirmationReply reply) async {
     await _handlerVoicePackageConfigureConfirmation(reply);
   }
 
@@ -440,9 +420,12 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
     VoicePackageConfigureConfirmationReply reply,
   ) async {
     showEasyLoading();
-    showBlueConnetctToastTimer(action: () {
+    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.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang = state.tempLangStr.value;
-            state.tempLangStr.value;
+        state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre = state.tempTimbreStr.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 ==
+          } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-              BluetoothConnectionState.disconnected) {
             dismissEasyLoading();
             cancelBlueConnetctToastTimer();
-            showBlueConnetctToast();
+            // showBlueConnetctToast();
           }
         });
         await Future.delayed(Duration(seconds: 1));
@@ -491,8 +471,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
     }
   }
 
-  void handleLockCurrentVoicePacketResult(
+  void handleLockCurrentVoicePacketResult(ReadLockCurrentVoicePacketReply reply) {
-      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 =
+        const int languageCodeEndIndex = languageCodeStartIndex + languageCodeLength; // 23
-            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<int> languageCodeBytes =
+        List<int> languageCodeBytes = reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex);
-            reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex);
 
         String languageCode = String.fromCharCodes(languageCodeBytes);
 
         languageCode = languageCode.trim(); // 移除首尾空格
-        languageCode =
+        languageCode = languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)
-            languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)
 
         if (languageCode != null && languageCode != '') {
-          final indexWhere = state.languages
+          final indexWhere = state.languages.indexWhere((element) => element.lang == languageCode);
-              .indexWhere((element) => element.lang == languageCode);
           if (indexWhere != -1) {
             print('锁板上的语言是:$languageCode,下标是:$indexWhere');
             state.selectPassthroughListIndex.value = indexWhere;
@@ -541,7 +516,9 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
 
   void readLockLanguage() async {
     showEasyLoading();
-    showBlueConnetctToastTimer(action: () {
+    showBlueConnetctToastTimer(
+        isShowBlueConnetctToast: false,
+        action: () {
           dismissEasyLoading();
         });
     await BlueManage().blueSendData(BlueManage().connectDeviceName,
@@ -552,11 +529,10 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
             lockID: BlueManage().connectDeviceName,
           ).packageData(),
         );
-      } else if (deviceConnectionState ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
-        showBlueConnetctToast();
+        // showBlueConnetctToast();
       }
     });
   }

lib/main/lockDetail/lockSet/thirdPartyPlatform/third_party_platform_logic.dart

@@ -1,40 +1,317 @@
+import 'dart:async';
+
+import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/app_settings/app_settings.dart';
+import 'package:star_lock/blue/blue_manage.dart';
+import 'package:star_lock/blue/io_protocol/io_getStarLockStatusInfo.dart';
+import 'package:star_lock/blue/io_protocol/io_readRegisterKey.dart';
+import 'package:star_lock/blue/io_protocol/io_sendAuthorizationCode.dart';
+import 'package:star_lock/blue/io_reply.dart';
+import 'package:star_lock/blue/io_tool/io_tool.dart';
+import 'package:star_lock/blue/io_tool/manager_event_bus.dart';
+import 'package:star_lock/blue/sender_manage.dart';
+import 'package:star_lock/main/lockDetail/lockSet/lockTime/getServerDatetime_entity.dart';
 import 'package:star_lock/main/lockDetail/lockSet/thirdPartyPlatform/third_party_platform_state.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/network/start_company_api.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
+import 'package:star_lock/tools/storage.dart';
 
 class ThirdPartyPlatformLogic extends BaseGetXController {
   ThirdPartyPlatformState state = ThirdPartyPlatformState();
 
-  void savePlatFormSetting() {
+  // 监听设备返回的数据
-    // showEasyLoading();
+  StreamSubscription<Reply>? _replySubscription;
-    showToast('功能待开放'.tr);
-    // dismissEasyLoading();
-  }
-
-  /// 查询TPP支持
-  void getActivateInfo() async {
-    final model = state.lockSetInfoData.value.lockBasicInfo?.model;
-    if (model != null && model != '') {
-      final response = await StartCompanyApi.to.getActivateInfo(model: model);
-      if (response.errorCode!.codeIsSuccessful) {
-       AppLog.log('${response.data}');
-      }
-    }
-  }
 
   @override
   void onReady() async {
-    // TODO: implement onReady
     super.onReady();
-    getActivateInfo();
+    await getActivateInfo();
+    _initReplySubscription();
+    await getServerDatetime();
+    showEasyLoading();
+    showBlueConnetctToastTimer(action: () {
+      dismissEasyLoading();
+    });
+    BlueManage().blueSendData(
+      BlueManage().connectDeviceName,
+      (BluetoothConnectionState connectionState) async {
+        if (connectionState == BluetoothConnectionState.connected) {
+          IoSenderManage.readRegisterKey(
+            lockID: BlueManage().connectDeviceName,
+          );
+        } else if (connectionState == BluetoothConnectionState.disconnected) {
+          dismissEasyLoading();
+          cancelBlueConnetctToastTimer();
+        }
+      },
+    );
   }
 
   @override
   void dispose() {
     dismissEasyLoading();
+    // 安全地取消订阅
+    _replySubscription?.cancel();
+    _replySubscription = null;
+
+    // 添加额外的日志来跟踪清理过程
+    AppLog.log('ThirdPartyPlatformLogic disposed, subscription cancelled');
+
     super.dispose();
   }
+
+  @override
+  void onClose() {
+    super.onClose();
+    // 安全地取消订阅
+    _replySubscription?.cancel();
+    _replySubscription = null;
+  }
+
+  // 从服务器时间
+  Future<void> getServerDatetime() async {
+    final GetServerDatetimeEntity entity = await ApiRepository.to.getServerDatetimeData(isUnShowLoading: true);
+    if (entity.errorCode!.codeIsSuccessful) {
+      state.serverTime = entity.data!.date! ~/ 1000;
+      state.differentialTime = entity.data!.date! ~/ 1000 - DateTime.now().millisecondsSinceEpoch ~/ 1000;
+    }
+  }
+
+  int getUTCNetTime() {
+    return DateTime.now().millisecondsSinceEpoch ~/ 1000 + state.differentialTime;
+  }
+
+  void _initReplySubscription() {
+    // 更严格的检查，避免重复初始化
+    if (_replySubscription != null) {
+      AppLog.log('订阅已存在，避免重复初始化');
+      return;
+    }
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
+      if (reply is SenderReadRegisterKeyCommandReply) {
+        _handleReadRegisterKeyReply(reply);
+      }
+
+      if (reply is GetStarLockStatuInfoReply) {
+        _replyGetStarLockStatusInfo(reply);
+      }
+      if (reply is SenderAuthorizationCodeCommandReply) {
+        _handleAuthorizationCodeReply(reply);
+      }
+    });
+    AppLog.log('创建新订阅：${_replySubscription.hashCode}');
+  }
+
+  // 获取星锁状态
+  Future<void> _replyGetStarLockStatusInfo(Reply reply) async {
+    final int status = reply.data[2];
+
+    switch (status) {
+      case 0x00:
+        //成功
+        dismissEasyLoading();
+        cancelBlueConnetctToastTimer();
+        //成功
+        // AppLog.log('获取锁状态成功');
+        // 厂商名称
+        int index = 3;
+        final List<int> vendor = reply.data.sublist(index, index + 20);
+        final String vendorStr = utf8String(vendor);
+        state.lockInfo['vendor'] = vendorStr;
+        // state.lockInfo["vendor"] = "XL";
+        index = index + 20;
+        // AppLog.log('厂商名称 vendorStr:$vendorStr');
+
+        // 锁设备类型
+        final int product = reply.data[index];
+        state.lockInfo['product'] = product;
+        index = index + 1;
+        // AppLog.log('锁设备类型 product:$product');
+
+        // 产品名称
+        final List<int> model = reply.data.sublist(index, index + 20);
+        final String modelStr = utf8String(model);
+        state.lockInfo['model'] = modelStr;
+        // state.lockInfo["model"] = "JL-BLE-01";
+        index = index + 20;
+        // AppLog.log('产品名称 mmodelStr:$modelStr');
+
+        // 软件版本
+        final List<int> fwVersion = reply.data.sublist(index, index + 20);
+        final String fwVersionStr = utf8String(fwVersion);
+        state.lockInfo['fwVersion'] = fwVersionStr;
+        index = index + 20;
+        // AppLog.log('软件版本 fwVersionStr:$fwVersionStr');
+
+        // 硬件版本
+        final List<int> hwVersion = reply.data.sublist(index, index + 20);
+        final String hwVersionStr = utf8String(hwVersion);
+        state.lockInfo['hwVersion'] = hwVersionStr;
+        index = index + 20;
+        // AppLog.log('硬件版本 hwVersionStr:$hwVersionStr');
+
+        // 厂商序列号
+        final List<int> serialNum0 = reply.data.sublist(index, index + 16);
+        final String serialNum0Str = utf8String(serialNum0);
+        state.lockInfo['serialNum0'] = serialNum0Str;
+        // state.lockInfo["serialNum0"] = "${DateTime.now().millisecondsSinceEpoch ~/ 10}";
+        index = index + 16;
+        // AppLog.log('厂商序列号 serialNum0Str:$serialNum0Str');
+        final response = await StartCompanyApi.to.getAuthorizationCode(
+          registerKey: state.registerKey.value,
+          model: modelStr,
+          serialNum0: serialNum0Str,
+          platform: 1,
+        );
+        if (response.errorCode!.codeIsSuccessful) {
+          BlueManage().blueSendData(
+            BlueManage().connectDeviceName,
+            (BluetoothConnectionState connectionState) async {
+              if (connectionState == BluetoothConnectionState.connected) {
+                IoSenderManage.sendAuthorizationCode(
+                  lockID: BlueManage().connectDeviceName,
+                  uuid: response.data?.extraParams?['uuid'],
+                  key: response.data?.authCode,
+                  mac: response.data?.extraParams?['mac'],
+                  platform: state.selectPlatFormIndex.value,
+                  utcTimeStamp: getUTCNetTime(),
+                );
+              } else if (connectionState == BluetoothConnectionState.disconnected) {
+                dismissEasyLoading();
+                cancelBlueConnetctToastTimer();
+              }
+            },
+            isAddEquipment: true,
+          );
+        }
+        break;
+      case 0x06:
+        //无权限
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
+        IoSenderManage.senderGetStarLockStatuInfo(
+          lockID: BlueManage().connectDeviceName,
+          userID: await Storage.getUid(),
+          utcTimeStamp: 0,
+          unixTimeStamp: 0,
+          isBeforeAddUser: false,
+          privateKey: getPrivateKeyList,
+        );
+        break;
+      default:
+        //失败
+        break;
+    }
+  }
+
+  void savePlatFormSetting() {
+    if (state.selectPlatFormIndex.value == 1 || state.selectPlatFormIndex.value == 0) {
+      if (state.registerKey.isNotEmpty) {
+        _requestAuthorizationCode();
+      }
+    } else {
+      showToast('目前只支持切换至涂鸦智能、锁通通协议'.tr);
+    }
+  }
+
+  /// 查询TPP支持
+  Future<void> getActivateInfo() async {
+    final model = state.lockSetInfoData.value.lockBasicInfo?.model;
+    if (model != null && model != '') {
+      final response = await StartCompanyApi.to.getTppSupport(model: model);
+      if (response.errorCode!.codeIsSuccessful) {
+        response.data?.forEach((element) {
+          state.tppSupportList.add(element);
+        });
+        state.tppSupportList.refresh();
+      }
+    }
+  }
+
+  void _handleReadRegisterKeyReply(SenderReadRegisterKeyCommandReply reply) {
+    final int status = reply.data[6];
+
+    switch (status) {
+      case 0x00:
+        final platform = reply.data[7];
+        // 提取 RegisterKey (从第7个字节开始，长度为40)
+        final List<int> registerKeyBytes = reply.data.sublist(8, 48);
+        final String registerKey = String.fromCharCodes(registerKeyBytes);
+        state.selectPlatFormIndex.value = platform;
+        print('platform: $platform');
+        print('Register Key: $registerKey');
+        state.registerKey.value = registerKey;
+        //成功
+        cancelBlueConnetctToastTimer();
+        dismissEasyLoading();
+        break;
+      default:
+        //失败
+        dismissEasyLoading();
+        cancelBlueConnetctToastTimer();
+        break;
+    }
+  }
+
+  void _requestAuthorizationCode() async {
+    showEasyLoading();
+    showBlueConnetctToastTimer(action: () {
+      dismissEasyLoading();
+    });
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
+      if (deviceConnectionState == BluetoothConnectionState.connected) {
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
+        IoSenderManage.senderGetStarLockStatuInfo(
+          lockID: BlueManage().connectDeviceName,
+          userID: await Storage.getUid(),
+          utcTimeStamp: state.serverTime,
+          unixTimeStamp: getLocalTime2(),
+          isBeforeAddUser: false,
+          privateKey: getPrivateKeyList,
+        );
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
+        //失败
+        dismissEasyLoading();
+        cancelBlueConnetctToastTimer();
+      }
+    });
+  }
+
+  int getLocalTime() {
+    final DateTime now = DateTime.now();
+    final Duration timeZoneOffset = now.timeZoneOffset;
+    return state.differentialTime + timeZoneOffset.inSeconds;
+  }
+
+  int getLocalTime2() {
+    final DateTime now = DateTime.now();
+    final Duration timeZoneOffset = now.timeZoneOffset;
+    return state.serverTime + timeZoneOffset.inSeconds;
+  }
+
+  void _handleAuthorizationCodeReply(SenderAuthorizationCodeCommandReply reply) {
+    final int status = reply.data[6];
+    switch (status) {
+      case 0x00:
+        //成功
+        cancelBlueConnetctToastTimer();
+        dismissEasyLoading();
+        if (state.selectPlatFormIndex.value == 1) {
+          showSuccess('操作成功,请尽快用"涂鸦”APP配置，如不使用请关闭该设置支持'.tr);
+        } else if (state.selectPlatFormIndex.value == 0) {
+          showSuccess('操作成功'.tr);
+        }
+
+        break;
+      default:
+        //失败
+        dismissEasyLoading();
+        cancelBlueConnetctToastTimer();
+
+        break;
+    }
+  }
 }

lib/main/lockDetail/lockSet/thirdPartyPlatform/third_party_platform_page.dart

@@ -17,8 +17,7 @@ class ThirdPartyPlatformPage extends StatefulWidget {
 
 class _ThirdPartyPlatformPageState extends State<ThirdPartyPlatformPage> {
   final ThirdPartyPlatformLogic logic = Get.put(ThirdPartyPlatformLogic());
-  final ThirdPartyPlatformState state =
+  final ThirdPartyPlatformState state = Get.find<ThirdPartyPlatformLogic>().state;
-      Get.find<ThirdPartyPlatformLogic>().state;
 
   @override
   Widget build(BuildContext context) {
@@ -46,7 +45,75 @@ class _ThirdPartyPlatformPageState extends State<ThirdPartyPlatformPage> {
   }
 
   Widget _buildBody() {
-    return ListView.builder(
+    return SingleChildScrollView(
+      child: Container(
+        decoration: BoxDecoration(
+          color: Colors.white,
+        ),
+        constraints: BoxConstraints(
+          minHeight: MediaQuery.of(context).size.height - 100.h,
+        ),
+        child: Stack(
+          children: [
+            // 1. 背景或空白区域（可选）
+            Container(
+              color: Colors.white,
+              padding: EdgeInsets.all(16.w),
+            ),
+            Positioned(
+              top: 30.h,
+              left: 50.w,
+              child: Image.asset(
+                'images/other/tuya.png',
+                height: 80.h,
+                fit: BoxFit.cover,
+              ),
+            ),
+            Positioned(
+              top: 130.h,
+              left: 150.w,
+              right: 150.w,
+              child: Image.asset(
+                'images/other/2.png',
+                height: 220.h,
+                fit: BoxFit.contain,
+              ),
+            ),
+            // 2. 顶部图标行：使用 Row 并排显示
+            Positioned(
+              top: 400.h,
+              right: 50.w,
+              child: Column(
+                children: [
+                  Image.asset(
+                    'images/other/matter.png',
+                    width: 280.w,
+                    fit: BoxFit.contain,
+                  ),
+                ],
+              ),
+            ),
+            Positioned(
+              top: 530.h,
+              left: 20.w,
+              right: 20.w,
+              child: Text(
+                '第三方协议的支持依赖网络授权下载，打开功能开关时请保证手机数据网络的正常连接'.tr,
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  fontSize: 20.sp,
+                  color: Colors.grey,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+
+            Positioned(
+              left: 0,
+              right: 0,
+              top: 620.h,
+              bottom: 0,
+              child: ListView.builder(
                 itemCount: state.platFormSet.length,
                 itemBuilder: (BuildContext context, int index) {
                   // 判断是否是最后一个元素（索引等于 itemCount - 1）
@@ -61,12 +128,12 @@ class _ThirdPartyPlatformPageState extends State<ThirdPartyPlatformPage> {
                     // 最后一个元素不显示分割线（取反）
                     isHaveDirection: false,
                     isHaveRightWidget: true,
-          rightWidget: Radio<String>(
+                    rightWidget: Obx(
+                      () => Radio<String>(
                         // Radio 的值：使用平台的唯一标识（如 id）
                         value: platform,
                         // 当前选中的值：与 selectPlatFormIndex 关联的 id
-            groupValue:
+                        groupValue: state.platFormSet.value[state.selectPlatFormIndex.value],
-                state.platFormSet.value[state.selectPlatFormIndex.value],
                         // 选中颜色（可选，默认主题色）
                         activeColor: AppColors.mainColor,
                         // 点击 Radio 时回调（更新选中索引）
@@ -74,8 +141,7 @@ class _ThirdPartyPlatformPageState extends State<ThirdPartyPlatformPage> {
                           if (value != null) {
                             setState(() {
                               // 找到当前选中平台的索引（根据 id 匹配）
-                  final newIndex =
+                              final newIndex = state.platFormSet.value.indexWhere((p) => p == value);
-                      state.platFormSet.value.indexWhere((p) => p == value);
                               if (newIndex != -1) {
                                 state.selectPlatFormIndex.value = newIndex;
                               }
@@ -83,6 +149,7 @@ class _ThirdPartyPlatformPageState extends State<ThirdPartyPlatformPage> {
                           }
                         },
                       ),
+                    ),
                     action: () {
                       setState(() {
                         state.selectPlatFormIndex.value = index;
@@ -92,6 +159,11 @@ class _ThirdPartyPlatformPageState extends State<ThirdPartyPlatformPage> {
                 },
                 shrinkWrap: true,
                 physics: const AlwaysScrollableScrollPhysics(),
+              ),
+            ),
+          ],
+        ),
+      ),
     );
   }
 }

lib/main/lockDetail/lockSet/thirdPartyPlatform/third_party_platform_state.dart

@@ -1,6 +1,8 @@
 import 'dart:ui';
 
 import 'package:get/get.dart';
+import 'package:get/get_rx/get_rx.dart';
+import 'package:star_lock/main/lockDetail/lockDetail/ActivateInfoResponse.dart';
 import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
 import 'package:star_lock/translations/app_dept.dart';
 
@@ -11,15 +13,23 @@ class ThirdPartyPlatformState {
   }
 
   Rx<LockSetInfoData> lockSetInfoData = LockSetInfoData().obs;
+  int differentialTime = 0; // 服务器时间即UTC+0时间
 
   // 响应式字符串集合（自动触发 UI 更新）
   final RxList<String> platFormSet = List.of({
     '锁通通'.tr,
     '涂鸦智能'.tr,
-    'Matter'.tr ,
+    'Matter'.tr,
   }).obs;
 
+  // 响应式字符串集合（自动触发 UI 更新）
+  final RxList<TppSupportInfo> tppSupportList = RxList<TppSupportInfo>([]);
+
   RxInt selectPlatFormIndex = 0.obs;
+  RxBool openNumber = false.obs;
+  RxString registerKey = ''.obs;
 
+  Map lockInfo = {};
 
+  int serverTime = 0; // 服务器时间即UTC+0时间
 }

lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart

@@ -79,7 +79,7 @@ class UploadDataLogic extends BaseGetXController {
 
         final int dataLength = reply.data[8];
         state.uploadPasswordDataList.addAll(reply.data.sublist(9, reply.data.length));
-        if (dataLength == 10) {
+        if (dataLength == 10 || dataLength == 9) {
           // 当数据是10的时候继续请求
           state.uploadPasswordPage = state.uploadPasswordPage + 1;
 
@@ -128,7 +128,7 @@ class UploadDataLogic extends BaseGetXController {
 
         final int dataLength = reply.data[8];
         state.uploadCardDataList.addAll(reply.data.sublist(9, reply.data.length));
-        if (dataLength == 10) {
+        if (dataLength == 10 || dataLength == 9) {
           // 当数据是10的时候继续请求
           state.uploadCardPage = state.uploadCardPage + 1;
 
@@ -175,7 +175,7 @@ class UploadDataLogic extends BaseGetXController {
 
         final int dataLength = reply.data[8];
         state.uploadFingerprintDataList.addAll(reply.data.sublist(9, reply.data.length));
-        if (dataLength == 10) {
+        if (dataLength == 10 || dataLength == 9) {
           // 当数据是10的时候继续请求
           state.uploadFingerprintPage = state.uploadFingerprintPage + 1;
 
@@ -222,7 +222,7 @@ class UploadDataLogic extends BaseGetXController {
 
         final int dataLength = reply.data[8];
         state.uploadFaceDataList.addAll(reply.data.sublist(9, reply.data.length));
-        if (dataLength == 10) {
+        if (dataLength == 10 || dataLength == 9) {
           // 当数据是10的时候继续请求
           state.uploadFacePage = state.uploadFacePage + 1;
 
@@ -269,7 +269,7 @@ class UploadDataLogic extends BaseGetXController {
 
         final int dataLength = reply.data[8];
         state.uploadPalmVeinDataList.addAll(reply.data.sublist(9, reply.data.length));
-        if (dataLength == 10) {
+        if (dataLength == 10 || dataLength == 9) {
           // 当数据是10的时候继续请求
           state.uploadPalmVeinPage = state.uploadPalmVeinPage + 1;
 
@@ -316,7 +316,7 @@ class UploadDataLogic extends BaseGetXController {
 
         final int dataLength = reply.data[8];
         state.uploadRemoteControlDataList.addAll(reply.data.sublist(9, reply.data.length));
-        if (dataLength == 10) {
+        if (dataLength == 10 || dataLength == 9) {
           // 当数据是10的时候继续请求
           state.uploadRemoteControlPage = state.uploadRemoteControlPage + 1;
 

lib/main/lockMian/lockList/lockList_logic.dart

@@ -32,12 +32,10 @@ class LockListLogic extends BaseGetXController {
   final ShowTipView showTipView = ShowTipView();
 
   List<GroupList> get groupDataListFiltered {
-    final List<GroupList> list =
+    final List<GroupList> list = groupDataList.map((GroupList e) => e.copy()).toList();
-        groupDataList.map((GroupList e) => e.copy()).toList();
     if (state.searchStr.value != '' && state.showSearch.value) {
       list.forEach((GroupList element) {
-        element.lockList?.removeWhere((LockListInfoItemEntity element) =>
+        element.lockList?.removeWhere((LockListInfoItemEntity element) => !(element.lockAlias?.contains(state.searchStr.value) ?? true));
-            !(element.lockAlias?.contains(state.searchStr.value) ?? true));
       });
     }
     if (list.length > 0) {
@@ -46,8 +44,7 @@ class LockListLogic extends BaseGetXController {
         final lockList = element.lockList;
         if (lockList != null && lockList.length > 0) {
           lockList.forEach((element) {
-            if (element.network?.peerId != null &&
+            if (element.network?.peerId != null && element.network?.peerId != '') {
-                element.network?.peerId != '') {
               StartChartManage().lockListPeerId.add(element);
             }
           });
@@ -68,11 +65,9 @@ class LockListLogic extends BaseGetXController {
   late StreamSubscription _setLockListInfoGroupEntity;
 
   void _initReplySubscription() {
-    _replySubscription =
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
-        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
       // 恢复出厂设置
-      if ((reply is FactoryDataResetReply) &&
+      if ((reply is FactoryDataResetReply)) {
-          (state.ifCurrentScreen.value == true)) {
         _replyFactoryDataResetKey(reply);
       }
     });
@@ -93,19 +88,18 @@ class LockListLogic extends BaseGetXController {
         break;
       case 0x06:
         //无权限
-        final List<String>? token = await Storage.getStringList(saveBlueToken);
+        final List<int> tokenData = reply.data.sublist(2, 6);
-        final List<int> getTokenList = changeStringListToIntList(token!);
+        final List<String> saveStrList = changeIntListToStringList(tokenData);
-
+        Storage.setStringList(saveBlueToken, saveStrList);
         IoSenderManage.senderFactoryDataReset(
           lockID: BlueManage().connectDeviceName,
           userID: await Storage.getUid(),
           keyID: '1',
           needAuthor: 1,
-            publicKey:
+          publicKey: state.publicKey,
-                state.lockListInfoItemEntity.bluetooth!.publicKey!.cast<int>(),
+          privateKey: state.privateKey,
-            privateKey:
+          token: tokenData,
-                state.lockListInfoItemEntity.bluetooth!.privateKey!.cast<int>(),
+        );
-            token: getTokenList);
         break;
       case 0x07:
         //无权限
@@ -146,8 +140,7 @@ class LockListLogic extends BaseGetXController {
         keyInfo.keyType == XSConstantMacro.keyTypeLong ||
         keyInfo.keyType == XSConstantMacro.keyTypeLoop) {
       // 当是正常使用跟待接收状态的时候
-      if (keyInfo.keyStatus == XSConstantMacro.keyStatusNormalUse ||
+      if (keyInfo.keyStatus == XSConstantMacro.keyStatusNormalUse || keyInfo.keyStatus == XSConstantMacro.keyStatusWaitReceive) {
-          keyInfo.keyStatus == XSConstantMacro.keyStatusWaitReceive) {
         return "${"余".tr}${DateTool().compareTimeGetDaysFromNow(keyInfo.endDate!)}${"天".tr}";
       } else {
         return XSConstantMacro.getKeyStatusStr(keyInfo.keyStatus!);
@@ -160,11 +153,7 @@ class LockListLogic extends BaseGetXController {
 
   //判断是否要显示提示
   bool getShowType(LockListInfoItemEntity keyInfo) {
-    final List<int> keyTypes = <int>[
+    final List<int> keyTypes = <int>[XSConstantMacro.keyTypeTime, XSConstantMacro.keyTypeOnce, XSConstantMacro.keyTypeLoop];
-      XSConstantMacro.keyTypeTime,
-      XSConstantMacro.keyTypeOnce,
-      XSConstantMacro.keyTypeLoop
-    ];
     final List<int> keyStatus = <int>[
       XSConstantMacro.keyStatusWaitIneffective,
       XSConstantMacro.keyStatusFrozen,
@@ -172,36 +161,30 @@ class LockListLogic extends BaseGetXController {
     ];
 
     //新增以上组合未包含--永久&&冻结状态 显示
-    final bool isLongFrozenStatus =
+    final bool isLongFrozenStatus = keyInfo.keyType == XSConstantMacro.keyTypeLong && keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen;
-        keyInfo.keyType == XSConstantMacro.keyTypeLong &&
+    final DateTime endDate = DateTime.fromMillisecondsSinceEpoch(keyInfo.endDate ?? 0);
-            keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen;
-    final DateTime endDate =
-        DateTime.fromMillisecondsSinceEpoch(keyInfo.endDate ?? 0);
     final DateTime now = DateTime.now();
     final bool isKeyType = keyTypes.contains(keyInfo.keyType);
     final bool isKeyStatus = keyStatus.contains(keyInfo.keyStatus);
     final Duration difference = endDate.difference(now);
     final bool isExpirationSoon = isKeyType && difference.inDays <= 15;
-    final bool isShow =
+    final bool isShow = isKeyType && isKeyStatus || isExpirationSoon || isLongFrozenStatus;
-        isKeyType && isKeyStatus || isExpirationSoon || isLongFrozenStatus;
     return isShow;
   }
 
   /// 以下为删除逻辑
-  void deleyLockLogicOfRoles() {
+  void deleyLockLogicOfRoles(LockListInfoItemEntity keyInfo) {
-    if (state.lockListInfoItemEntity.isLockOwner == 1) {
+    if (state.lockListInfoItemEntity.value.isLockOwner == 1) {
       // 超级管理员必须通过连接蓝牙删除
       showTipView.showIosTipWithContentDialog('删除锁后，所有信息都会一起删除，确定删除锁吗？'.tr, () {
         // 删除锁
         AppLog.log('调用了删除锁');
         showTipView.resetGetController();
-        showTipView.showTFViewAlertDialog(
+        showTipView.showTFViewAlertDialog(state.passwordTF, '请输入登录密码'.tr, '请输入登录密码'.tr, () => checkLoginPassword(keyInfo));
-            state.passwordTF, '请输入登录密码'.tr, '请输入登录密码'.tr, checkLoginPassword);
       });
-    } else if (state.lockListInfoItemEntity.keyRight == 1) {
+    } else if (state.lockListInfoItemEntity.value.keyRight == 1) {
       // 授权管理员弹框提示
-      showTipView.showDeleteAdministratorIsHaveAllDataDialog(
+      showTipView.showDeleteAdministratorIsHaveAllDataDialog('同时删除其发送的所有钥匙，钥匙删除后不能恢复'.tr, (bool a) {
-          '同时删除其发送的所有钥匙，钥匙删除后不能恢复'.tr, (bool a) {
         // 授权管理员删除
         state.deleteAdministratorIsHaveAllData.value = a;
         deletKeyData();
@@ -213,20 +196,20 @@ class LockListLogic extends BaseGetXController {
   }
 
   // 查询账户密码
-  Future<void> checkLoginPassword() async {
+  Future<void> checkLoginPassword(LockListInfoItemEntity keyInfo) async {
     final LockListInfoEntity entity = await ApiRepository.to.checkLoginPassword(
       password: state.passwordTF.text,
     );
     if (entity.errorCode!.codeIsSuccessful) {
       Get.back();
-      factoryDataResetAction();
+      factoryDataResetAction(keyInfo);
     }
   }
 
   // 当是锁拥有者的时候，删除锁
   Future<void> deletLockInfoData() async {
     final LockListInfoEntity entity = await ApiRepository.to.deletOwnerLockData(
-      lockId: state.lockListInfoItemEntity.lockId!,
+      lockId: state.lockListInfoItemEntity.value.lockId!,
     );
     if (entity.errorCode!.codeIsSuccessful) {
       BlueManage().connectDeviceMacAddress = '';
@@ -239,10 +222,9 @@ class LockListLogic extends BaseGetXController {
   // 普通用户或者授权管理员删除钥匙
   Future<void> deletKeyData() async {
     final LockListInfoEntity entity = await ApiRepository.to.deletOwnerKeyData(
-        lockId: state.lockListInfoItemEntity.lockId.toString(),
+        lockId: state.lockListInfoItemEntity.value.lockId.toString(),
-        keyId: state.lockListInfoItemEntity.keyId.toString(),
+        keyId: state.lockListInfoItemEntity.value.keyId.toString(),
-        includeUnderlings:
+        includeUnderlings: state.deleteAdministratorIsHaveAllData.value == true ? 1 : 0);
-            state.deleteAdministratorIsHaveAllData.value == true ? 1 : 0);
     if (entity.errorCode!.codeIsSuccessful) {
       BlueManage().connectDeviceMacAddress = '';
       SchedulerBinding.instance.addPostFrameCallback((_) {
@@ -252,7 +234,7 @@ class LockListLogic extends BaseGetXController {
   }
 
   // 恢复出厂设置
-  Future<void> factoryDataResetAction() async {
+  Future<void> factoryDataResetAction(LockListInfoItemEntity keyInfo) async {
     showEasyLoading();
     showBlueConnetctToastTimer(
         isShowBlueConnetctToast: false,
@@ -260,31 +242,23 @@ class LockListLogic extends BaseGetXController {
           dismissEasyLoading();
           showDeletAlertTipDialog();
         });
-    BlueManage().blueSendData(state.lockListInfoItemEntity.lockName!,
+    BlueManage().blueSendData(state.lockListInfoItemEntity.value.lockName!, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
-        final List<int> publicKeyData =
+        final List<int> publicKeyData = state.lockListInfoItemEntity.value.bluetooth!.publicKey!.cast<int>();
-            state.lockListInfoItemEntity.bluetooth!.publicKey!.cast<int>();
+        final List<String> saveStrList = changeIntListToStringList(publicKeyData);
-        final List<String> saveStrList =
-            changeIntListToStringList(publicKeyData);
         await Storage.setStringList(saveBluePublicKey, saveStrList);
 
         // 私钥
-        final List<int> privateKeyData =
+        final List<int> privateKeyData = state.lockListInfoItemEntity.value.bluetooth!.privateKey!.cast<int>();
-            state.lockListInfoItemEntity.bluetooth!.privateKey!.cast<int>();
+        final List<String> savePrivateKeyList = changeIntListToStringList(privateKeyData);
-        final List<String> savePrivateKeyList =
-            changeIntListToStringList(privateKeyData);
         await Storage.setStringList(saveBluePrivateKey, savePrivateKeyList);
 
         // signKey
-        final List<int> signKeyData =
+        final List<int> signKeyData = state.lockListInfoItemEntity.value.bluetooth!.signKey!.cast<int>();
-            state.lockListInfoItemEntity.bluetooth!.signKey!.cast<int>();
+        final List<String> saveSignKeyList = changeIntListToStringList(signKeyData);
-        final List<String> saveSignKeyList =
-            changeIntListToStringList(signKeyData);
         await Storage.setStringList(saveBlueSignKey, saveSignKeyList);
 
-        final List<String> saveTokenList =
+        final List<String> saveTokenList = changeIntListToStringList(<int>[0, 0, 0, 0]);
-            changeIntListToStringList(<int>[0, 0, 0, 0]);
         await Storage.setStringList(saveBlueToken, saveTokenList);
 
         IoSenderManage.senderFactoryDataReset(
@@ -292,11 +266,13 @@ class LockListLogic extends BaseGetXController {
             userID: await Storage.getUid(),
             keyID: '1',
             needAuthor: 1,
-            publicKey:
+            publicKey: keyInfo.bluetooth?.publicKey ?? [],
-                state.lockListInfoItemEntity.bluetooth!.publicKey!.cast<int>(),
+            privateKey: keyInfo.bluetooth?.privateKey ?? [],
-            privateKey:
-                state.lockListInfoItemEntity.bluetooth!.privateKey!.cast<int>(),
             token: <int>[0, 0, 0, 0]);
+        state.publicKey.value = keyInfo.bluetooth?.publicKey ?? [];
+        state.privateKey.value = keyInfo.bluetooth?.privateKey ?? [];
+        state.publicKey.refresh();
+        state.privateKey.refresh();
       } else if (connectionState == BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
@@ -353,9 +329,7 @@ class LockListLogic extends BaseGetXController {
   }
 
   void _initEventHandler() {
-    _setLockListInfoGroupEntity = eventBus
+    _setLockListInfoGroupEntity = eventBus.on<SetLockListInfoGroupEntity>().listen((SetLockListInfoGroupEntity event) async {
-        .on<SetLockListInfoGroupEntity>()
-        .listen((SetLockListInfoGroupEntity event) async {
       setLockListInfoGroupEntity(event.lockListInfoGroupEntity);
     });
   }

lib/main/lockMian/lockList/lockList_page.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:get/get.dart';
+import 'package:star_lock/app_settings/app_settings.dart';
 import 'package:star_lock/main/lockMian/lockList/lockList_state.dart';
 
 import '../../../appRouters.dart';
@@ -14,8 +15,7 @@ import 'lockListGroup_view.dart';
 import 'lockList_logic.dart';
 
 class LockListPage extends StatefulWidget {
-  const LockListPage({required this.lockListInfoGroupEntity, Key? key})
+  const LockListPage({required this.lockListInfoGroupEntity, Key? key}) : super(key: key);
-      : super(key: key);
   final LockListInfoGroupEntity lockListInfoGroupEntity;
 
   @override
@@ -30,16 +30,15 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
   void initState() {
     super.initState();
     logic = Get.put(LockListLogic(widget.lockListInfoGroupEntity));
-    state = Get
+    state = Get.find<LockListLogic>().state;
-        .find<LockListLogic>()
-        .state;
   }
 
   @override
   Widget build(BuildContext context) {
-    return Obx(() => Scaffold(
+    return Obx(
+      () => Scaffold(
         body: ListView.separated(
-        itemCount: logic.groupDataListFiltered.length,
+          itemCount: logic.groupDataList.length,
           itemBuilder: (BuildContext context, int index) {
             final GroupList itemData = logic.groupDataListFiltered[index];
             return _buildLockExpandedList(context, index, itemData, key: ValueKey(itemData.groupId));
@@ -51,20 +50,21 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
               height: 1,
               color: AppColors.greyLineColor,
             );
-        }),
+          },
-    ));
+        ),
+      ),
+    );
   }
 
   //设备多层级列表
-  Widget _buildLockExpandedList(BuildContext context, int index,
+  Widget _buildLockExpandedList(BuildContext context, int index, GroupList itemData, {Key? key}) {
-      GroupList itemData, {Key? key}) {
+    final List<LockListInfoItemEntity> lockItemList = itemData.lockList ?? <LockListInfoItemEntity>[];
-    final List<LockListInfoItemEntity> lockItemList =
-        itemData.lockList ?? <LockListInfoItemEntity>[];
     return LockListGroupView(
       key: key,
       onTap: () {
         //是否选中组
-        if (itemData.isChecked) {} else {}
+        if (itemData.isChecked) {
+        } else {}
         setState(() {});
       },
       typeImgList: const <dynamic>[],
@@ -91,8 +91,12 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
                 children: <Widget>[
                   SlidableAction(
                     onPressed: (BuildContext context) {
-                      state.lockListInfoItemEntity = keyInfo;
+                      state.publicKey.value = keyInfo.bluetooth?.publicKey ?? [];
-                      logic.deleyLockLogicOfRoles();
+                      state.privateKey.value = keyInfo.bluetooth?.privateKey ?? [];
+                      state.lockListInfoItemEntity.value = keyInfo;
+                      state.lockListInfoItemEntity.refresh();
+                      AppLog.log('msg=================:${state.lockListInfoItemEntity.value}');
+                      logic.deleyLockLogicOfRoles(keyInfo);
                     },
                     backgroundColor: Colors.red,
                     foregroundColor: Colors.white,
@@ -102,10 +106,8 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
                 ],
               ),
               child: lockInfoListItem(keyInfo, isLast, () {
-                if ((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
+                if ((keyInfo.keyType == XSConstantMacro.keyTypeTime || keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
-                    keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
+                    (keyInfo.keyStatus == XSConstantMacro.keyStatusWaitIneffective)) {
-                    (keyInfo.keyStatus ==
-                        XSConstantMacro.keyStatusWaitIneffective)) {
                   logic.showToast('您的钥匙未生效'.tr);
                   return;
                 }
@@ -116,14 +118,12 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
                   logic.showToast('您的钥匙已冻结'.tr);
                   return;
                 }
-                if ((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
+                if ((keyInfo.keyType == XSConstantMacro.keyTypeTime || keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
-                    keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
                     (keyInfo.keyStatus == XSConstantMacro.keyStatusExpired)) {
                   logic.showToast('您的钥匙已过期'.tr);
                   return;
                 }
-                Get.toNamed(Routers.lockDetailMainPage,
+                Get.toNamed(Routers.lockDetailMainPage, arguments: <String, Object>{
-                    arguments: <String, Object>{
                   // "lockMainEntity": widget.lockMainEntity,
                   'keyInfo': keyInfo,
                   'isOnlyOneData': false,
@@ -134,26 +134,18 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
     );
   }
 
-  Widget lockInfoListItem(LockListInfoItemEntity keyInfo, bool isLast,
+  Widget lockInfoListItem(LockListInfoItemEntity keyInfo, bool isLast, Function() action) {
-      Function() action) {
     return GestureDetector(
       onTap: action,
       child: Container(
         // height: 122.h,
-        margin: isLast
+        margin: isLast ? EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w, bottom: 20.w) : EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w),
-            ? EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w, bottom: 20.w)
-            : EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w),
         decoration: BoxDecoration(
-          color: (((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
+          color: (((keyInfo.keyType == XSConstantMacro.keyTypeTime || keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
-              keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
+                      (keyInfo.keyStatus == XSConstantMacro.keyStatusWaitIneffective ||
-              (keyInfo.keyStatus ==
+                          keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen ||
-                  XSConstantMacro.keyStatusWaitIneffective ||
+                          keyInfo.keyStatus == XSConstantMacro.keyStatusExpired)) ||
-                  keyInfo.keyStatus ==
+                  (keyInfo.keyType == XSConstantMacro.keyTypeLong && keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen))
-                      XSConstantMacro.keyStatusFrozen ||
-                  keyInfo.keyStatus ==
-                      XSConstantMacro.keyStatusExpired)) ||
-              (keyInfo.keyType == XSConstantMacro.keyTypeLong &&
-                  keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen))
               ? AppColors.greyBackgroundColor
               : Colors.white,
           borderRadius: BorderRadius.circular(20.w),
@@ -177,9 +169,7 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
                         style: TextStyle(
                             fontSize: 24.sp,
                             fontWeight: FontWeight.w500,
-                            color: keyInfo.passageMode == 1
+                            color: keyInfo.passageMode == 1 ? AppColors.openPassageModeColor : AppColors.darkGrayTextColor),
-                                ? AppColors.openPassageModeColor
-                                : AppColors.darkGrayTextColor),
                       ),
                     ],
                   ),
@@ -193,8 +183,7 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
                 SizedBox(width: 2.w),
                 Text(
                   '${keyInfo.electricQuantity!}%',
-                  style: TextStyle(
+                  style: TextStyle(fontSize: 18.sp, color: AppColors.darkGrayTextColor),
-                      fontSize: 18.sp, color: AppColors.darkGrayTextColor),
                 ),
                 SizedBox(width: 30.w),
               ],
@@ -211,10 +200,7 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
                         borderRadius: BorderRadius.circular(5.w),
                         color: AppColors.openPassageModeColor,
                       ),
-                      child: Text('常开模式开启'.tr,
+                      child: Text('常开模式开启'.tr, style: TextStyle(fontSize: 18.sp, color: AppColors.appBarIconColor)),
-                          style: TextStyle(
-                              fontSize: 18.sp,
-                              color: AppColors.appBarIconColor)),
                     ),
                   ],
                 )),
@@ -226,8 +212,7 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
                     SizedBox(width: 30.w),
                     Text(
                       '远程开锁'.tr,
-                      style: TextStyle(
+                      style: TextStyle(fontSize: 18.sp, color: AppColors.darkGrayTextColor),
-                          fontSize: 18.sp, color: AppColors.darkGrayTextColor),
                     ),
                   ],
                 )),
@@ -241,13 +226,9 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
                       padding: EdgeInsets.only(right: 5.w, left: 5.w),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(5.w),
-                        color:
+                        color: DateTool().compareTimeIsOvertime(keyInfo.endDate!) ? AppColors.listTimeYellowColor : AppColors.mainColor,
-                        DateTool().compareTimeIsOvertime(keyInfo.endDate!)
-                            ? AppColors.listTimeYellowColor
-                            : AppColors.mainColor,
                       ),
-                      child: Text(logic.getKeyEffective(keyInfo),
+                      child: Text(logic.getKeyEffective(keyInfo), style: TextStyle(fontSize: 18.sp, color: Colors.white)
-                          style: TextStyle(fontSize: 18.sp, color: Colors.white)
                           // child: Text(logic.compareTimeIsOvertime(keyInfo.endDate!) ? "已过期" : "余${logic.compareTimeGetDaysFromNow(keyInfo.endDate!)}天", style: TextStyle(fontSize: 18.sp, color: Colors.white)
                           ),
                     ),
@@ -258,13 +239,8 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
               children: <Widget>[
                 SizedBox(width: 30.w),
                 Text(
-                  "${logic.getUseKeyTypeStr(keyInfo.startDate, keyInfo.endDate,
+                  "${logic.getUseKeyTypeStr(keyInfo.startDate, keyInfo.endDate, keyInfo.keyType)}/${keyInfo.isLockOwner == 1 ? '超级管理员'.tr : (keyInfo.keyRight == 1 ? "授权管理员".tr : "普通用户".tr)}",
-                      keyInfo.keyType)}/${keyInfo.isLockOwner == 1
+                  style: TextStyle(fontSize: 18.sp, color: AppColors.darkGrayTextColor),
-                      ? '超级管理员'.tr
-                      : (keyInfo.keyRight == 1 ? "授权管理员".tr : "普通用户"
-                      .tr)}",
-                  style: TextStyle(
-                      fontSize: 18.sp, color: AppColors.darkGrayTextColor),
                 ),
               ],
             ),
@@ -286,13 +262,10 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
   @override
   void dispose() {
     Get.delete<LockListLogic>();
+
     /// 取消路由订阅
     AppRouteObserver().routeObserver.unsubscribe(this);
-    super
+    super.dispose();
-    .
-    dispose
-    (
-    );
   }
 
   /// 从上级界面进入 当前界面即将出现

lib/main/lockMian/lockList/lockList_state.dart

@@ -7,11 +7,14 @@ import '../entity/lockListInfo_entity.dart';
 class LockListState{
 
   RxBool itemStatusIsEable = false.obs; // 列表里面item是否能点击
-  LockListInfoItemEntity lockListInfoItemEntity = LockListInfoItemEntity(); // 当前选中要删除的item
+  // 修改后
+  Rx<LockListInfoItemEntity> lockListInfoItemEntity = LockListInfoItemEntity().obs; // 当前选中要删除的item
   TextEditingController passwordTF = TextEditingController();
   RxBool deleteAdministratorIsHaveAllData = false.obs; // 删除管理员是否有所有数据
   RxBool ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示
   RxBool showSearch = false.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示
   RxString searchStr = ''.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示
+  RxList<int> publicKey=<int>[].obs;
+  RxList<int> privateKey=<int>[].obs;
 
 }

lib/main/lockMian/lockList/lockList_xhj_page.dart

@@ -192,8 +192,9 @@ class _LockListXHJPageState extends State<LockListXHJPage> with RouteAware {
           children: <Widget>[
             SlidableAction(
               onPressed: (BuildContext context) {
-                state.lockListInfoItemEntity = keyInfo;
+                state.lockListInfoItemEntity.value = keyInfo;
-                logic.deleyLockLogicOfRoles();
+                state.lockListInfoItemEntity.refresh();
+                logic.deleyLockLogicOfRoles(keyInfo);
               },
               backgroundColor: Colors.red,
               foregroundColor: Colors.white,

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 =
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
-        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
       if (reply is VoicePackageConfigureReply) {
         // 语言包配置开始
         _handlerStartVoicePackageConfigure(reply);
@@ -78,12 +77,14 @@ class LockVoiceSettingLogic extends BaseGetXController {
     });
   }
 
-  Future<void> _executeLogic(
+  Future<void> _executeLogic(VoicePackageConfigureConfirmationReply reply) async {
-      VoicePackageConfigureConfirmationReply reply) async {
     showEasyLoading();
-    showBlueConnetctToastTimer(action: () {
+    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.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang = state.tempLangStr.value;
-            state.tempLangStr.value;
+        state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre = state.tempTimbreStr.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 ==
+          } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-              BluetoothConnectionState.disconnected) {
             dismissEasyLoading();
             cancelBlueConnetctToastTimer();
-            showBlueConnetctToast();
+            // showBlueConnetctToast();
           }
         });
         await Future.delayed(Duration(seconds: 1));
-        eventBus
+        eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-            .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
+        final indexWhere = state.languages.indexWhere((element) => element.lang == currentLocale.toString());
-            .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,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
-        (BluetoothConnectionState deviceConnectionState) async {
       if (deviceConnectionState == BluetoothConnectionState.connected) {
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
+        final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
-            changeStringListToIntList(privateKey!);
-        final List<String>? signKey =
-            await Storage.getStringList(saveBlueSignKey);
         final List<int> 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 ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
 
@@ -216,8 +207,7 @@ class LockVoiceSettingLogic extends BaseGetXController {
     });
   }
 
-  void _handlerVoicePackageConfigureProcess(
+  void _handlerVoicePackageConfigureProcess(VoicePackageConfigureProcessReply reply) {
-      VoicePackageConfigureProcessReply reply) {
     // 取消超时定时器（已收到回复，无需继续等待）
     _sendTimeoutTimer?.cancel();
     _isTimeout = false; // 重置超时标志
@@ -235,8 +225,7 @@ class LockVoiceSettingLogic extends BaseGetXController {
   }
 
   // 开始配置语音包
-  void _handlerStartVoicePackageConfigure(
+  void _handlerStartVoicePackageConfigure(VoicePackageConfigureReply reply) async {
-      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 =
+      final PassthroughListResponse entity = await ApiRepository.to.getPassthroughList(data: {
-          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:
+              langText: ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle,
-                  ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle,
               name: element.name,
             );
 
@@ -311,10 +298,8 @@ class LockVoiceSettingLogic extends BaseGetXController {
           }
         });
         state.languages.refresh();
-        final lang = state
+        final lang = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang;
-            .lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang;
+        final timbre = state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.timbre;
-        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.data!.length + state.voiceSubcontractingSize - 1) ~/ state.voiceSubcontractingSize;
-            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.progress.value = (state.voiceSubcontractingIndex + 1) / state.voiceSubcontractingCount;
-        (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,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
-        (BluetoothConnectionState deviceConnectionState) async {
       if (deviceConnectionState == BluetoothConnectionState.connected) {
         BlueManage().writeCharacteristicWithResponse(
           VoicePackageConfigureProcess(
@@ -401,8 +383,7 @@ class LockVoiceSettingLogic extends BaseGetXController {
             data: data,
           ).packageData(),
         );
-      } else if (deviceConnectionState ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
         // showBlueConnetctToast();
@@ -445,9 +426,12 @@ class LockVoiceSettingLogic extends BaseGetXController {
 
   void readLockLanguage() async {
     showEasyLoading();
-    showBlueConnetctToastTimer(action: () {
+    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 ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
-        showBlueConnetctToast();
+        // showBlueConnetctToast();
       }
     });
   }
 
-  void handleLockCurrentVoicePacketResult(
+  void handleLockCurrentVoicePacketResult(ReadLockCurrentVoicePacketReply reply) {
-      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 =
+        const int languageCodeEndIndex = languageCodeStartIndex + languageCodeLength; // 23
-            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<int> languageCodeBytes =
+        List<int> languageCodeBytes = reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex);
-            reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex);
 
         String languageCode = String.fromCharCodes(languageCodeBytes);
 
         languageCode = languageCode.trim(); // 移除首尾空格
-        languageCode =
+        languageCode = languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)
-            languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)
 
         print('LanguageCode: $languageCode'); // 例如: zh_CN, en_US
 
         if (languageCode != null && languageCode != '') {
-          final indexWhere = state.languages
+          final indexWhere = state.languages.indexWhere((element) => element.lang == languageCode);
-              .indexWhere((element) => element.lang == languageCode);
           if (indexWhere != -1) {
             print('锁板上的语言是:$languageCode,下标是:$indexWhere');
             state.selectPassthroughListIndex.value = indexWhere;

lib/mine/addLock/saveLock/saveLock_logic.dart

@@ -31,8 +31,7 @@ class SaveLockLogic extends BaseGetXController {
   late StreamSubscription<Reply> _replySubscription;
 
   void _initReplySubscription() {
-    _replySubscription =
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
-        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
       if (reply is AddUserReply && state.ifCurrentScreen.value == true) {
         _replyAddUserKey(reply);
       }
@@ -66,15 +65,11 @@ class SaveLockLogic extends BaseGetXController {
         break;
       case 0x06:
         //无权限
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
-            changeStringListToIntList(privateKey!);
 
-        final List<String>? publicKey =
+        final List<String>? publicKey = await Storage.getStringList(saveBluePublicKey);
-            await Storage.getStringList(saveBluePublicKey);
+        final List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
-        final List<int> publicKeyDataList =
-            changeStringListToIntList(publicKey!);
 
         IoSenderManage.senderAddUser(
             lockID: BlueManage().connectDeviceName,
@@ -215,19 +210,14 @@ class SaveLockLogic extends BaseGetXController {
         showBlueConnetctToast();
       }
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
-        (BluetoothConnectionState deviceConnectionState) async {
       if (deviceConnectionState == BluetoothConnectionState.connected) {
         // 私钥
-        final List<String>? privateKey =
+        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-            await Storage.getStringList(saveBluePrivateKey);
+        final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-        final List<int> getPrivateKeyList =
-            changeStringListToIntList(privateKey!);
 
-        final List<String>? publicKey =
+        final List<String>? publicKey = await Storage.getStringList(saveBluePublicKey);
-            await Storage.getStringList(saveBluePublicKey);
+        final List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
-        final List<int> publicKeyDataList =
-            changeStringListToIntList(publicKey!);
 
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         List<int> getTokenList = <int>[0, 0, 0, 0];
@@ -257,8 +247,7 @@ class SaveLockLogic extends BaseGetXController {
             privateKey: getPrivateKeyList,
             token: getTokenList,
             isBeforeAddUser: true);
-      } else if (deviceConnectionState ==
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
-          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
         state.sureBtnState.value = 0;
@@ -376,16 +365,14 @@ class SaveLockLogic extends BaseGetXController {
     // positionMap['address'] = state.addressInfo['address'];
 
     final Map<String, dynamic> bluetooth = <String, dynamic>{};
-    bluetooth['bluetoothDeviceId'] = BlueManage().connectDeviceMacAddress;
+    bluetooth['bluetoothDeviceId'] = state.lockInfo['mac'];
     bluetooth['bluetoothDeviceName'] = BlueManage().connectDeviceName;
 
-    final List<String>? publicKey =
+    final List<String>? publicKey = await Storage.getStringList(saveBluePublicKey);
-        await Storage.getStringList(saveBluePublicKey);
     final List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
     bluetooth['publicKey'] = publicKeyDataList;
 
-    final List<String>? privateKey =
+    final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
-        await Storage.getStringList(saveBluePrivateKey);
     final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
     bluetooth['privateKey'] = getPrivateKeyList;
 
@@ -410,8 +397,7 @@ class SaveLockLogic extends BaseGetXController {
       final String getMobile = (await Storage.getMobile())!;
       ApmHelper.instance.trackEvent('save_lock_result', {
         'lock_name': BlueManage().connectDeviceName,
-        'account':
+        'account': getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!,
-            getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!,
         'date': DateTool().getNowDateWithType(1),
         'save_lock_result': '成功',
       });
@@ -427,8 +413,7 @@ class SaveLockLogic extends BaseGetXController {
       final String getMobile = (await Storage.getMobile())!;
       ApmHelper.instance.trackEvent('save_lock_result', {
         'lock_name': BlueManage().connectDeviceName,
-        'account':
+        'account': getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!,
-            getMobile.isNotEmpty ? getMobile : (await Storage.getEmail())!,
         'date': DateTool().getNowDateWithType(1),
         'save_lock_result': '${entity.errorCode}--${entity.errorMsg}',
       });
@@ -489,26 +474,18 @@ class SaveLockLogic extends BaseGetXController {
     // BlueManage().disconnect();
 
     // 查询锁设置信息
-    final LockSetInfoEntity entity =
+    final LockSetInfoEntity entity = await ApiRepository.to.getLockSettingInfoData(
-        await ApiRepository.to.getLockSettingInfoData(
       lockId: state.lockId.toString(),
     );
     if (entity.errorCode!.codeIsSuccessful) {
       state.lockSetInfoData.value = entity.data!;
       if (state.lockSetInfoData.value.lockFeature?.wifi == 1) {
         // 如果是wifi锁，需要配置WIFI
-        Get.toNamed(Routers.wifiListPage, arguments: {
+        Get.toNamed(Routers.wifiListPage, arguments: {'lockSetInfoData': state.lockSetInfoData.value, 'pageName': 'saveLock'});
-          'lockSetInfoData': state.lockSetInfoData.value,
-          'pageName': 'saveLock'
-        });
       } else if (state.lockSetInfoData.value.lockFeature?.languageSpeech == 1) {
-        Get.toNamed(Routers.lockVoiceSettingPage, arguments: {
+        Get.toNamed(Routers.lockVoiceSettingPage, arguments: {'lockSetInfoData': state.lockSetInfoData.value, 'pageName': 'saveLock'});
-          'lockSetInfoData': state.lockSetInfoData.value,
-          'pageName': 'saveLock'
-        });
       } else {
-        eventBus.fire(RefreshLockListInfoDataEvent(
+        eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true, isUnShowLoading: true));
-            clearScanDevices: true, isUnShowLoading: true));
         Future<void>.delayed(const Duration(seconds: 1), () {
           // Get.close(state.isFromMap == 1
           //     ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
@@ -518,15 +495,12 @@ class SaveLockLogic extends BaseGetXController {
         //刚刚配对完，需要对开锁页锁死 2 秒
         Future<void>.delayed(const Duration(milliseconds: 200), () {
           if (Get.isRegistered<LockDetailLogic>()) {
-            Get.find<LockDetailLogic>()
+            Get.find<LockDetailLogic>().functionBlocker.countdownProhibited(duration: const Duration(seconds: 2));
-                .functionBlocker
-                .countdownProhibited(duration: const Duration(seconds: 2));
           }
         });
       }
     } else {
-      eventBus.fire(RefreshLockListInfoDataEvent(
+      eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true, isUnShowLoading: true));
-          clearScanDevices: true, isUnShowLoading: true));
       Future<void>.delayed(const Duration(seconds: 1), () {
         // Get.close(state.isFromMap == 1
         //     ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
@@ -536,9 +510,7 @@ class SaveLockLogic extends BaseGetXController {
       //刚刚配对完，需要对开锁页锁死 2 秒
       Future<void>.delayed(const Duration(milliseconds: 200), () {
         if (Get.isRegistered<LockDetailLogic>()) {
-          Get.find<LockDetailLogic>()
+          Get.find<LockDetailLogic>().functionBlocker.countdownProhibited(duration: const Duration(seconds: 2));
-              .functionBlocker
-              .countdownProhibited(duration: const Duration(seconds: 2));
         }
       });
     }

lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart

@@ -22,8 +22,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
   final GatewayConfigurationWifiState state = GatewayConfigurationWifiState();
 
   Future<void> gatewayDistributionNetwork() async {
-    final LoginEntity entity = await ApiRepository.to
+    final LoginEntity entity = await ApiRepository.to.gatewayDistributionNetwork(
-        .gatewayDistributionNetwork(
         gatewayName: state.gatewayNameTF.text,
         gatewayMac: state.gatewayModel.mac,
         serialNumber: state.gatewayModel.serialNum,
@@ -42,19 +41,35 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
   }
 
   Future<void> getGatewayConfiguration() async {
-    final GetGatewayConfigurationEntity entity =
+    final GetGatewayConfigurationEntity entity = await ApiRepository.to.getGatewayConfiguration(timeout: 60);
-        await ApiRepository.to.getGatewayConfiguration(timeout: 60);
     if (entity.errorCode!.codeIsSuccessful) {
-      state.getGatewayConfigurationStr = entity.data ?? '';
+      String configStr = entity.data ?? '';
-      // AppLog.log('state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}');
+
+      // 解析并添加时区偏移量
+      if (configStr.isNotEmpty) {
+        try {
+          Map<String, dynamic> config = jsonDecode(configStr);
+          config['timeZoneOffset'] = DateTime.now().timeZoneOffset.inSeconds;
+          AppLog.log('state.config:$config');
+          state.getGatewayConfigurationStr = jsonEncode(config);
+        } catch (e) {
+          AppLog.log('处理网关配置时区信息失败: $e');
+          // 如果解析失败，仍然使用原始配置
+          state.getGatewayConfigurationStr = configStr;
+        }
+      } else {
+        state.getGatewayConfigurationStr = configStr;
+      }
+
+      AppLog.log('state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}');
     }
   }
 
   // 监听设备返回的数据
   late StreamSubscription<Reply> _replySubscription;
+
   void _initReplySubscription() {
-    _replySubscription =
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
-        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
       // WIFI配网
       // if(reply is GatewayConfiguringWifiReply) {
       //   _replySenderConfiguringWifi(reply);
@@ -96,8 +111,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
         dismissEasyLoading();
         final int secretKeyJsonLength = (reply.data[3] << 8) + reply.data[4];
-        final List<int> secretKeyList =
+        final List<int> secretKeyList = reply.data.sublist(5, 5 + secretKeyJsonLength);
-            reply.data.sublist(5, 5 + secretKeyJsonLength);
         state.gatewayJson = utf8String(secretKeyList);
 
         gatewayDistributionNetwork();
@@ -113,8 +127,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
 
   // 点击配置wifi
   Future<void> senderConfiguringWifiAction() async {
-    AppLog.log(
+    AppLog.log('state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}');
-        'state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}');
     if (state.wifiNameTF.text.isEmpty) {
       showToast('请输入wifi名称'.tr);
       return;
@@ -142,8 +155,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
           dismissEasyLoading();
           state.sureBtnState.value = 0;
         });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
-        (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         IoSenderManage.gatewayConfiguringWifiCommand(
           ssid: state.wifiNameTF.text,
@@ -162,6 +174,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
   }
 
   final NetworkInfo _networkInfo = NetworkInfo();
+
   Future<String> getWifiName() async {
     String ssid = '';
     ssid = (await _networkInfo.getWifiName())!;

lib/network/api.dart

@@ -305,6 +305,8 @@ abstract class Api {
       '/lockSetting/updateLockSetting'; // 设置语音包
   final String reportBuyRequestURL =
       '/service/reportBuyRequest'; // 上报增值服务购买请求
-  final String getActivateInfoURL =
+  final String getTppSupportURL =
       '/api/authCode/getTppSupport'; // 查询ttp
+  final String getActivateInfoURL =
+      '/api/authCode/getActivateInfo'; // 查询ttp
 }

lib/network/start_company_api.dart

@@ -10,28 +10,48 @@ import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.
 import 'package:star_lock/tools/storage.dart';
 
 class StartCompanyApi extends BaseProvider {
-  // 星图url
+  // 星启url
   String _startChartHost = 'https://company.skychip.top';
 
   static StartCompanyApi get to => Get.put(StartCompanyApi());
 
-  // 设置星图host
+  // 设置星启host
   set startChartHost(String value) {
     _startChartHost = value;
   }
 
-  // 获取星图host
+  // 获取星启host
   String get startChartHost => _startChartHost;
 
   // ttp查询
-  Future<ActivateInfoResponse> getActivateInfo({
+  Future<TppSupportResponse> getTppSupport({
     required String model,
+  }) async {
+    final response = await post(
+      _startChartHost + getTppSupportURL.toUrl,
+      jsonEncode(<String, dynamic>{
+        'model': model,
+      }),
+      isUnShowLoading: true,
+      isUserBaseUrl: false,
+    );
+    return TppSupportResponse.fromJson(response.body);
+  }
+
+  // 获取授权码
+  Future<ActivateInfoResponse> getAuthorizationCode({
+    required String registerKey,
+    required String model,
+    required String serialNum0,
+    required int platform,
   }) async {
     final response = await post(
       _startChartHost + getActivateInfoURL.toUrl,
       jsonEncode(<String, dynamic>{
+        'register_key': registerKey,
+        'platform': platform,
         'model': model,
-
+        'serial_num0': serialNum0,
       }),
       isUnShowLoading: true,
       isUserBaseUrl: false,

lib/talk/starChart/handle/impl/udp_talk_data_handler.dart

@@ -14,8 +14,7 @@ import 'package:star_lock/talk/starChart/proto/talk_data_h264_frame.pb.dart';
 
 // class UdpTalkDataHandler extends ScpMessageBaseHandle
 //     implements ScpMessageHandler {
-class UdpTalkDataHandler extends ScpMessageBaseHandle
+class UdpTalkDataHandler extends ScpMessageBaseHandle implements ScpMessageHandler {
-    implements ScpMessageHandler {
   // 单例实现
   static final UdpTalkDataHandler instance = UdpTalkDataHandler();
 
@@ -73,10 +72,7 @@ class UdpTalkDataHandler extends ScpMessageBaseHandle
     // _asyncLog(
     //     '分包数据:messageId:$messageId [$spIndex/$spTotal] PayloadLength:$PayloadLength');
     if (messageType == MessageTypeConstant.RealTimeData) {
-      if (spTotal != null &&
+      if (spTotal != null && spTotal > 1 && messageId != null && spIndex != null) {
-          spTotal > 1 &&
-          messageId != null &&
-          spIndex != null) {
         // 分包处理
         return handleFragmentedPayload(
           messageId: messageId,
@@ -129,13 +125,11 @@ class UdpTalkDataHandler extends ScpMessageBaseHandle
     talkDataH264Frame.mergeFromBuffer(talkData.content);
     // AppLog.log('处理H264帧: frameType=${talkDataH264Frame.frameType}, frameSeq=${talkDataH264Frame.frameSeq},MessageId:${scpMessage.MessageId}');
     frameHandler.handleFrame(talkDataH264Frame, talkData, scpMessage);
-    
   }
 
   /// 处理图片数据
   void _handleVideoImage(TalkData talkData) async {
-    final List<Uint8List> processCompletePayload =
+    final List<Uint8List> processCompletePayload = await _processCompletePayload(Uint8List.fromList(talkData.content));
-        await _processCompletePayload(Uint8List.fromList(talkData.content));
     processCompletePayload.forEach((element) {
       talkData.content = element;
       talkDataRepository.addTalkData(
@@ -177,8 +171,7 @@ class UdpTalkDataHandler extends ScpMessageBaseHandle
           startIdx = i;
           i++; // Skip the next byte
         } else if (nextByte == 0xD9 && startIdx != -1) {
-          frames
+          frames.add(Uint8List.view(payload.buffer, startIdx, i + 2 - startIdx));
-              .add(Uint8List.view(payload.buffer, startIdx, i + 2 - startIdx));
           startIdx = -1;
           i++; // Skip the next byte
         }

lib/talk/starChart/handle/impl/udp_talk_request_handler.dart

@@ -18,20 +18,18 @@ import 'package:star_lock/tools/push/xs_jPhush.dart';
 import 'package:star_lock/tools/storage.dart';
 import 'package:star_lock/translations/current_locale_tool.dart';
 
-class UdpTalkRequestHandler extends ScpMessageBaseHandle
+class UdpTalkRequestHandler extends ScpMessageBaseHandle implements ScpMessageHandler {
-    implements ScpMessageHandler {
+  RxString currentLanguage = CurrentLocaleTool.getCurrentLocaleString().obs; // 当前选择语言
-  RxString currentLanguage =
-      CurrentLocaleTool.getCurrentLocaleString().obs; // 当前选择语言
 
   @override
   void handleReq(ScpMessage scpMessage) async {
     // 判断是否登录账户
     final loginData = await Storage.getLoginData();
     // 如果登录账户不为空，且不是被动接听状态，且不是接听成功状态
-    if (loginData != null &&
+    if (loginData != null && (talkStatus.status != TalkStatus.passiveCallWaitingAnswer || talkStatus.status != TalkStatus.answeredSuccessfully)) {
-        (talkStatus.status != TalkStatus.passiveCallWaitingAnswer ||
-            talkStatus.status != TalkStatus.answeredSuccessfully)) {
       //  收到对讲请求
+      AppLog.log('收到对讲请求ToPeerId：${scpMessage.ToPeerId}');
+      AppLog.log('收到对讲请求FromPeerId：${scpMessage.FromPeerId}');
       final TalkReq talkReq = scpMessage.Payload;
       startChartManage.FromPeerId = scpMessage.ToPeerId!;
       startChartManage.ToPeerId = scpMessage.FromPeerId!;
@@ -64,8 +62,6 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle
       _handleResponseSendExpect(
         lockPeerID: scpMessage.FromPeerId!,
       );
-      // 发送预期数据
-      startChartManage.startTalkExpectTimer();
       // 停止发送对讲请求
       startChartManage.stopCallRequestMessageTimer();
       // 收到应答后取消超时判断
@@ -97,8 +93,7 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle
   }
 
   // 收到来电请求时进行本地通知
-  Future<void> _showTalkRequestNotification(
+  Future<void> _showTalkRequestNotification({required String talkObjectName}) async {
-      {required String talkObjectName}) async {
     if (Platform.isAndroid) {
       final Map<String, dynamic> message = {
         'platform': 'all',
@@ -167,14 +162,12 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle
   void _handleRequestSendExpect({
     required String lockPeerID,
   }) async {
-    final LockListInfoItemEntity currentKeyInfo =
+    final LockListInfoItemEntity currentKeyInfo = CommonDataManage().currentKeyInfo;
-        CommonDataManage().currentKeyInfo;
 
     var isH264 = currentKeyInfo.lockFeature?.isH264 == 1;
     var isMJpeg = currentKeyInfo.lockFeature?.isMJpeg == 1;
 
-    final LockListInfoGroupEntity? lockListInfoGroupEntity =
+    final LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData();
-        await Storage.getLockMainListData();
     if (lockListInfoGroupEntity != null) {
       lockListInfoGroupEntity!.groupList?.forEach((element) {
         final lockList = element.lockList;
@@ -195,18 +188,15 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle
     if (isH264) {
       // 锁支持H264，发送H264视频和G711音频期望
       startChartManage.sendOnlyH264VideoTalkExpectData();
-      print(
+      print('app收到的对讲请求后，发送的预期数据=========锁支持H264，发送H264视频格式期望数据,peerID=${lockPeerID}');
-          'app收到的对讲请求后，发送的预期数据=========锁支持H264，发送H264视频格式期望数据,peerID=${lockPeerID}');
     } else if (isMJpeg) {
       // 锁只支持MJPEG，发送图像视频和G711音频期望
       startChartManage.sendOnlyImageVideoTalkExpectData();
-      print(
+      print('app收到的对讲请求后，发送的预期数据=========锁不支持H264，支持MJPEG，发送MJPEG视频格式期望数据,peerID=${lockPeerID}');
-          'app收到的对讲请求后，发送的预期数据=========锁不支持H264，支持MJPEG，发送MJPEG视频格式期望数据,peerID=${lockPeerID}');
     } else {
       // 默认使用图像视频
       startChartManage.sendOnlyImageVideoTalkExpectData();
-      print(
+      print('app收到的对讲请求后，发送的预期数据=========锁不支持H264和MJPEG，默认发送MJPEG视频格式期望数据,peerID=${lockPeerID}');
-          'app收到的对讲请求后，发送的预期数据=========锁不支持H264和MJPEG，默认发送MJPEG视频格式期望数据,peerID=${lockPeerID}');
     }
   }
 
@@ -214,14 +204,12 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle
   void _handleResponseSendExpect({
     required String lockPeerID,
   }) async {
-    final LockListInfoItemEntity currentKeyInfo =
+    final LockListInfoItemEntity currentKeyInfo = CommonDataManage().currentKeyInfo;
-        CommonDataManage().currentKeyInfo;
 
     var isH264 = currentKeyInfo.lockFeature?.isH264 == 1;
     var isMJpeg = currentKeyInfo.lockFeature?.isMJpeg == 1;
 
-    final LockListInfoGroupEntity? lockListInfoGroupEntity =
+    final LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData();
-        await Storage.getLockMainListData();
     if (lockListInfoGroupEntity != null) {
       lockListInfoGroupEntity!.groupList?.forEach((element) {
         final lockList = element.lockList;
@@ -242,18 +230,15 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle
     if (isH264) {
       // 锁支持H264，发送H264视频和G711音频期望
       startChartManage.sendH264VideoAndG711AudioTalkExpectData();
-      AppLog.log(
+      AppLog.log('app主动发对讲请求，收到回复后发送的预期数据=======锁支持H264，发送H264视频格式期望数据,peerID=${lockPeerID}');
-          'app主动发对讲请求，收到回复后发送的预期数据=======锁支持H264，发送H264视频格式期望数据,peerID=${lockPeerID}');
     } else if (isMJpeg) {
       // 锁只支持MJPEG，发送图像视频和G711音频期望
       startChartManage.sendImageVideoAndG711AudioTalkExpectData();
-      AppLog.log(
+      AppLog.log('app主动发对讲请求，收到回复后发送的预期数据=======锁不支持H264，支持MJPEG，发送MJPEG视频格式期望数据,peerID=${lockPeerID}');
-          'app主动发对讲请求，收到回复后发送的预期数据=======锁不支持H264，支持MJPEG，发送MJPEG视频格式期望数据,peerID=${lockPeerID}');
     } else {
       // 默认使用图像视频
       startChartManage.sendImageVideoAndG711AudioTalkExpectData();
-      AppLog.log(
+      AppLog.log('app主动发对讲请求，收到回复后发送的预期数据=======锁不支持H264和MJPEG，默认发送MJPEG视频格式期望数据,peerID=${lockPeerID}');
-          'app主动发对讲请求，收到回复后发送的预期数据=======锁不支持H264和MJPEG，默认发送MJPEG视频格式期望数据,peerID=${lockPeerID}');
     }
   }
 }

lib/talk/starChart/star_chart_manage.dart

@@ -61,12 +61,9 @@ class StartChartManage {
 
   // 单例对象
   static final StartChartManage _instance = StartChartManage._internal();
-  final TalkeRequestOverTimeTimerManager talkeRequestOverTimeTimerManager =
+  final TalkeRequestOverTimeTimerManager talkeRequestOverTimeTimerManager = TalkeRequestOverTimeTimerManager();
-      TalkeRequestOverTimeTimerManager();
+  final TalkePingOverTimeTimerManager talkePingOverTimeTimerManager = TalkePingOverTimeTimerManager();
-  final TalkePingOverTimeTimerManager talkePingOverTimeTimerManager =
+  final TalkDataOverTimeTimerManager talkDataOverTimeTimerManager = TalkDataOverTimeTimerManager();
-      TalkePingOverTimeTimerManager();
-  final TalkDataOverTimeTimerManager talkDataOverTimeTimerManager =
-      TalkDataOverTimeTimerManager();
 
   // 工厂构造函数，返回单例对象
   factory StartChartManage() {
@@ -171,8 +168,7 @@ class StartChartManage {
       FromPeerId = loginData?.starchart?.starchartId ?? '';
     } else {
       _log(text: '开始注册客户端');
-      final StarChartRegisterNodeEntity requestStarChartRegisterNode =
+      final StarChartRegisterNodeEntity requestStarChartRegisterNode = await _requestStarChartRegisterNode();
-          await _requestStarChartRegisterNode();
       await _saveStarChartRegisterNodeToStorage(requestStarChartRegisterNode);
       FromPeerId = requestStarChartRegisterNode.peer!.id ?? '';
       bindUserStarchart(requestStarChartRegisterNode);
@@ -180,18 +176,14 @@ class StartChartManage {
   }
 
   //绑定星图配置
-  Future<void> bindUserStarchart(
+  Future<void> bindUserStarchart(StarChartRegisterNodeEntity requestStarChartRegisterNode) async {
-      StarChartRegisterNodeEntity requestStarChartRegisterNode) async {
     try {
       final LoginEntity entity = await ApiRepository.to.bindUserStarchart(
         starchartId: requestStarChartRegisterNode.peer?.id ?? '',
-        starchartPeerPublicKey:
+        starchartPeerPublicKey: requestStarChartRegisterNode.peer?.publicKey ?? '',
-            requestStarChartRegisterNode.peer?.publicKey ?? '',
+        starchartPeerPrivateKey: requestStarChartRegisterNode.peer?.privateKey ?? '',
-        starchartPeerPrivateKey:
-            requestStarChartRegisterNode.peer?.privateKey ?? '',
       );
-      requestStarChartRegisterNode.peer?.id =
+      requestStarChartRegisterNode.peer?.id = entity.data?.starchart?.starchartId;
-          entity.data?.starchart?.starchartId;
       if (entity.errorCode!.codeIsSuccessful) {
         AppLog.log('绑定成功');
       } else {
@@ -204,14 +196,12 @@ class StartChartManage {
 
   // 中继查询
   Future<void> _relayQuery() async {
-    final RelayInfoEntity relayInfoEntity =
+    final RelayInfoEntity relayInfoEntity = await StartChartApi.to.relayQueryInfo();
-        await StartChartApi.to.relayQueryInfo();
     _saveRelayInfoEntityToStorage(relayInfoEntity);
     if (relayInfoEntity.client_addr != null) {
       localPublicHost = relayInfoEntity.client_addr!;
     }
-    if (relayInfoEntity.relay_list != null &&
+    if (relayInfoEntity.relay_list != null && relayInfoEntity.relay_list!.length > 0) {
-        relayInfoEntity.relay_list!.length > 0) {
       for (int i = 0; i <= relayInfoEntity.relay_list!.length; i++) {
         final data = relayInfoEntity.relay_list?[i];
         if (data?.peerID != FromPeerId) {
@@ -239,8 +229,7 @@ class StartChartManage {
   // 初始化udp
   Future<void> _onlineRelayService() async {
     var addressIListenFrom = InternetAddress.anyIPv4;
-    await RawDatagramSocket.bind(addressIListenFrom, localPort)
+    await RawDatagramSocket.bind(addressIListenFrom, localPort).then((RawDatagramSocket socket) {
-        .then((RawDatagramSocket socket) {
       // 设置接收缓冲区大小 (SO_RCVBUF = 8)
       if (AppPlatform.isAndroid) {
         socket.setRawOption(
@@ -291,15 +280,15 @@ class StartChartManage {
   }
 
   // 发送RbcuInfo 地址交换消息
-  void _sendRbcuInfoMessage(
+  void _sendRbcuInfoMessage({required String ToPeerId, bool isResp = false}) async {
-      {required String ToPeerId, bool isResp = false}) async {
     final uuid = _uuid.v1();
-    final int timestamp = DateTime.now().millisecondsSinceEpoch;
+    final int timestamp = DateTime
+        .now()
+        .millisecondsSinceEpoch;
     final Int64 int64Timestamp = Int64(timestamp); // 使用构造函数
 
     // 获取本机所有ip地址和中继返回的外网地址
-    final List<ListenAddrData> listenAddrDataList =
+    final List<ListenAddrData> listenAddrDataList = await _makeListenAddrDataList();
-        await _makeListenAddrDataList();
     listenAddrDataList.insert(
       0, // 插入到头部
       ListenAddrData(
@@ -309,15 +298,13 @@ class StartChartManage {
     );
 
     final address = listenAddrDataList
-        .where((element) =>
+        .where((element) => element.type == ListenAddrTypeConstant.local) // 过滤出本地地址
-            element.type == ListenAddrTypeConstant.local) // 过滤出本地地址
         .map((e) => e.address) // 转换为 List<String?>
         .where((addr) => addr != null) // 过滤掉 null 值
         .map(
           (addr) => addr!.replaceAll(IpConstant.udpUrl, ''),
     ) // 去除 "udp://" 前缀
-        .cast<
+        .cast<String>(); // 转换为 Iterable<String>// 将 Iterable<String?> 转换为 Iterable<String>
-            String>(); // 转换为 Iterable<String>// 将 Iterable<String?> 转换为 Iterable<String>
     _rbcuSessionId = uuid;
     final RbcuInfo rbcuInfo = RbcuInfo(
       sessionId: uuid,
@@ -340,28 +327,21 @@ class StartChartManage {
   void _sendRbcuProbeMessage() async {
     // 随机字符串数据
     String generateRandomString(int length) {
-      const chars =
+      const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-          'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
       final random = Random();
       return String.fromCharCodes(
-        List.generate(
+        List.generate(length, (index) => chars.codeUnitAt(random.nextInt(chars.length))),
-            length, (index) => chars.codeUnitAt(random.nextInt(chars.length))),
       );
     }
 
-    if (rbcuInfo != null &&
+    if (rbcuInfo != null && rbcuInfo!.address != null && rbcuInfo!.address.length > 0) {
-        rbcuInfo!.address != null &&
-        rbcuInfo!.address.length > 0) {
       rbcuInfo!.address.forEach((element) {
         // 拆分 element 字符串
         final parts = element.split(':');
         final host = parts[0]; // IP 地址
         final port = int.tryParse(parts[1]) ?? 0; // 端口号，如果解析失败则默认为 0
 
-        final RbcuProbe rbcuProbe = RbcuProbe(
+        final RbcuProbe rbcuProbe = RbcuProbe(sessionId: _rbcuSessionId, data: generateRandomString(100), targetAddress: element);
-            sessionId: _rbcuSessionId,
-            data: generateRandomString(100),
-            targetAddress: element);
         final rbcuProBeBuffer = rbcuProbe.writeToBuffer();
         _sendNatMessage(message: rbcuProBeBuffer, host: host, port: port);
       });
@@ -378,8 +358,7 @@ class StartChartManage {
   // 启动定时任务
   void startSendingRbcuInfoMessages({required String ToPeerId}) {
     // 每隔 1 秒执行一次 _sendRbcuInfoMessage
-    rbcuInfoTimer ??=
+    rbcuInfoTimer ??= Timer.periodic(Duration(seconds: _defaultIntervalTime), (timer) {
-        Timer.periodic(Duration(seconds: _defaultIntervalTime), (timer) {
       // 发送RbcuInfo 地址交换消息
       _log(text: '发送RbcuInfo 地址交换消息');
       _sendRbcuInfoMessage(ToPeerId: ToPeerId);
@@ -389,8 +368,7 @@ class StartChartManage {
   // 发送打洞包
   void startSendingRbcuProbeTMessages() {
     // 每隔 1 秒执行一次 _sendRbcuInfoMessage
-    rbcuProbeTimer ??=
+    rbcuProbeTimer ??= Timer.periodic(Duration(seconds: _defaultIntervalTime), (timer) {
-        Timer.periodic(Duration(seconds: _defaultIntervalTime), (timer) {
       // 发送RbcuProbe
       _sendRbcuProbeMessage();
     });
@@ -398,8 +376,7 @@ class StartChartManage {
 
   // 发送打洞确认包
   void startSendingRbcuConfirmTMessages() {
-    rbcuConfirmTimer ??=
+    rbcuConfirmTimer ??= Timer.periodic(Duration(seconds: _defaultIntervalTime), (timer) {
-        Timer.periodic(Duration(seconds: _defaultIntervalTime), (timer) {
       // 发送RbcuProbe
       _sendRbcuConfirmMessage();
     });
@@ -458,11 +435,11 @@ class StartChartManage {
     //     );
     //   }
     // }
-    final LockListInfoItemEntity currentKeyInfo =
+    final LockListInfoItemEntity currentKeyInfo = CommonDataManage().currentKeyInfo;
-        CommonDataManage().currentKeyInfo;
     final isH264 = currentKeyInfo.lockFeature?.isH264 == 1;
     final isMJpeg = currentKeyInfo.lockFeature?.isMJpeg == 1;
-
+    AppLog.log('isH264:${isH264}');
+    AppLog.log('isMJpeg:${isMJpeg}');
     // 优先使用H264，其次是MJPEG
     if (isH264) {
       Get.toNamed(
@@ -483,6 +460,7 @@ class StartChartManage {
         seconds: _defaultIntervalTime,
       ),
           (Timer timer) async {
+        AppLog.log('发送对讲请求：${ToPeerId}');
         await sendCallRequestMessage(ToPeerId: ToPeerId);
       },
     );
@@ -526,8 +504,7 @@ class StartChartManage {
       List<int> packetTalkData = payload.sublist(start, end);
 
       // 分包数据不递增messageID
-      final messageId =
+      final messageId = MessageCommand.getNextMessageId(toPeerId, increment: false);
-          MessageCommand.getNextMessageId(toPeerId, increment: false);
       // 组装分包数据
       final message = MessageCommand.talkDataMessage(
         ToPeerId: toPeerId,
@@ -562,8 +539,7 @@ class StartChartManage {
         final List<int> message = MessageCommand.heartbeatMessage(
           FromPeerId: FromPeerId,
           ToPeerId: relayPeerId,
-          MessageId:
+          MessageId: MessageCommand.getNextMessageId(relayPeerId, increment: true),
-              MessageCommand.getNextMessageId(relayPeerId, increment: true),
         );
         await _sendMessage(message: message);
       },
@@ -572,8 +548,7 @@ class StartChartManage {
   }
 
   // 发送回声测试消息
-  void sendEchoMessage(
+  void sendEchoMessage({required List<int> payload, required String toPeerId}) async {
-      {required List<int> payload, required String toPeerId}) async {
     // 计算需要分多少个包发送
     final int totalPackets = (payload.length / _maxPayloadSize).ceil();
     // 循环遍历
@@ -587,8 +562,7 @@ class StartChartManage {
       List<int> packet = payload.sublist(start, end);
 
       // 分包数据不递增messageID
-      final messageId =
+      final messageId = MessageCommand.getNextMessageId(toPeerId, increment: false);
-          MessageCommand.getNextMessageId(toPeerId, increment: false);
       // 组装分包数据
       final message = MessageCommand.echoMessage(
         ToPeerId: toPeerId,
@@ -606,13 +580,14 @@ class StartChartManage {
   }
 
   // 发送网关初始化消息
-  void sendGatewayResetMessage(
+  void sendGatewayResetMessage({required String ToPeerId, required int gatewayId}) async {
-      {required String ToPeerId, required int gatewayId}) async {
     final message = MessageCommand.gatewayResetMessage(
       ToPeerId: ToPeerId,
       FromPeerId: FromPeerId,
       gatewayId: gatewayId,
-      time: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      time: DateTime
+          .now()
+          .millisecondsSinceEpoch ~/ 1000,
       MessageId: MessageCommand.getNextMessageId(ToPeerId, increment: true),
     );
     await _sendMessage(message: message);
@@ -728,8 +703,7 @@ class StartChartManage {
   }
 
   // 发送通话保持消息
-  Future<void> sendTalkPingMessage(
+  Future<void> sendTalkPingMessage({required String ToPeerId, required String FromPeerId}) async {
-      {required String ToPeerId, required String FromPeerId}) async {
     final message = MessageCommand.talkPingMessage(
       ToPeerId: ToPeerId,
       FromPeerId: FromPeerId,
@@ -825,11 +799,9 @@ class StartChartManage {
 
   // 发送消息
   Future<void> _sendMessage({required List<int> message}) async {
-    var result = await _udpSocket?.send(
+    var result = await _udpSocket?.send(message, InternetAddress(remoteHost), remotePort);
-        message, InternetAddress(remoteHost), remotePort);
     if (result != message.length) {
-      throw StartChartMessageException(
+      throw StartChartMessageException('❌Udp send data error---->   $result ${message.length}');
-          '❌Udp send data error---->   $result ${message.length}');
       // _udpSocket = null;
     }
 
@@ -846,15 +818,11 @@ class StartChartManage {
   }
 
   // 发送消息
-  Future<void> _sendNatMessage(
+  Future<void> _sendNatMessage({required List<int> message, required String host, required int port}) async {
-      {required List<int> message,
-      required String host,
-      required int port}) async {
     _log(text: '发送nat消息');
     var result = await _udpSocket?.send(message, InternetAddress(host), port);
     if (result != message.length) {
-      throw StartChartMessageException(
+      throw StartChartMessageException('❌Udp send data error---->   $result ${message.length}');
-          '❌Udp send data error---->   $result ${message.length}');
       // _udpSocket = null;
     }
   }
@@ -864,8 +832,7 @@ class StartChartManage {
     // 获取设备信息
     final Map<String, String> deviceInfo = await _getDeviceInfo();
     // 发送注册节点请求
-    final StarChartRegisterNodeEntity response =
+    final StarChartRegisterNodeEntity response = await StartChartApi.to.starChartRegisterNode(
-        await StartChartApi.to.starChartRegisterNode(
       product: _productName,
       model: '${deviceInfo['brand']}_${deviceInfo['model']}',
       name: '${deviceInfo['id']}',
@@ -875,8 +842,7 @@ class StartChartManage {
   }
 
   // 保存星图注册节点信息至缓存
-  Future<void> _saveStarChartRegisterNodeToStorage(
+  Future<void> _saveStarChartRegisterNodeToStorage(StarChartRegisterNodeEntity starChartRegisterNodeEntity) async {
-      StarChartRegisterNodeEntity starChartRegisterNodeEntity) async {
     if (starChartRegisterNodeEntity != null) {
       await Storage.saveStarChartRegisterNodeInfo(starChartRegisterNodeEntity);
       final LoginData? loginData = await Storage.getLoginData();
@@ -886,8 +852,7 @@ class StartChartManage {
   }
 
   // 保存星图中继服务器信息至缓存
-  Future<void> _saveRelayInfoEntityToStorage(
+  Future<void> _saveRelayInfoEntityToStorage(RelayInfoEntity relayInfoEntity) async {
-      RelayInfoEntity relayInfoEntity) async {
     if (relayInfoEntity != null) {
       await Storage.saveRelayInfo(relayInfoEntity);
     }
@@ -909,8 +874,7 @@ class StartChartManage {
     );
 
     // 获取本机所有ip地址和中继返回的外网地址
-    final List<ListenAddrData> listenAddrDataList =
+    final List<ListenAddrData> listenAddrDataList = await _makeListenAddrDataList();
-        await _makeListenAddrDataList();
 
     //
     final RelayServiceData relayServiceData = RelayServiceData(
@@ -977,11 +941,12 @@ class StartChartManage {
           String ipAddress = address.address;
           // 移除 IPv6 地址中的接口标识符（如果有）
           if (ipAddress.contains('%')) {
-            ipAddress = ipAddress.split('%').first;
+            ipAddress = ipAddress
+                .split('%')
+                .first;
           }
           // 确保 IP 地址不为空且不在排除列表中
-          if (ipAddress.isNotEmpty &&
+          if (ipAddress.isNotEmpty && !IpConstant.reportExcludeIp.contains(ipAddress)) {
-              !IpConstant.reportExcludeIp.contains(ipAddress)) {
             ipAddresses.add(ipAddress);
           }
         }
@@ -998,8 +963,7 @@ class StartChartManage {
 
   /// 获取设备信息
   Future<Map<String, String>> _getDeviceInfo() async {
-    final Map<String, String> deviceInfo =
+    final Map<String, String> deviceInfo = await DeviceInfoUtils.getDeviceInfo();
-        await DeviceInfoUtils.getDeviceInfo();
     return deviceInfo;
   }
 
@@ -1016,8 +980,7 @@ class StartChartManage {
       if (host != null && port != null) {
         try {
           // 尝试进行 DNS 解析
-          final List<InternetAddress> addresses =
+          final List<InternetAddress> addresses = await InternetAddress.lookup(host);
-              await InternetAddress.lookup(host);
           if (addresses.isEmpty) {
             throw FormatException('DNS resolution failed for $host');
           }
@@ -1082,8 +1045,7 @@ class StartChartManage {
     final int payloadType = scpMessage.PayloadType ?? 0;
     final int messageType = scpMessage.MessageType ?? 0;
     try {
-      final ScpMessageHandler handler =
+      final ScpMessageHandler handler = ScpMessageHandlerFactory.createHandler(payloadType);
-          ScpMessageHandlerFactory.createHandler(payloadType);
       if (messageType == MessageTypeConstant.Req) {
         handler.handleReq(scpMessage);
       } else if (messageType == MessageTypeConstant.Resp) {
@@ -1170,10 +1132,18 @@ class StartChartManage {
   }
 
   /// 修改预期接收到的数据
-  void changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(
+  void changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer({required TalkExpectReq talkExpect}) {
-      {required TalkExpectReq talkExpect}) {
     _defaultTalkExpect = talkExpect;
-    reStartTalkExpectMessageTimer();
+    sendTalkExpectMessage(
+      talkExpect: _defaultTalkExpect,
+    );
+    sendTalkExpectMessage(
+      talkExpect: _defaultTalkExpect,
+    );
+    sendTalkExpectMessage(
+      talkExpect: _defaultTalkExpect,
+    );
+    // reStartTalkExpectMessageTimer();
   }
 
   void reSetDefaultTalkExpect() {
@@ -1190,8 +1160,7 @@ class StartChartManage {
       videoType: [VideoTypeE.IMAGE],
       audioType: [],
     );
-    changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(
+    changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(talkExpect: talkExpectReq);
-        talkExpect: talkExpectReq);
   }
 
   /// 修改预期接收到的数据
@@ -1200,20 +1169,17 @@ class StartChartManage {
       videoType: [VideoTypeE.H264],
       audioType: [],
     );
-    changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(
+    changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(talkExpect: talkExpectReq);
-        talkExpect: talkExpectReq);
   }
 
   /// 修改预期接收到的数据
   void sendImageVideoAndG711AudioTalkExpectData() {
-    changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(
+    changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(talkExpect: TalkConstant.ImageExpect);
-        talkExpect: TalkConstant.ImageExpect);
   }
 
   /// 修改预期接收到的数据
   void sendH264VideoAndG711AudioTalkExpectData() {
-    changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(
+    changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(talkExpect: TalkConstant.H264Expect);
-        talkExpect: TalkConstant.H264Expect);
   }
 
   /// 发送远程开锁

lib/talk/starChart/views/native/talk_view_native_decode_logic.dart

@@ -104,10 +104,6 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         codecType: 'h264',
       );
       // 初始化解码器并获取textureId
-      AppLog.log(
-          'StartChartManage().videoWidth:${StartChartManage().videoWidth}');
-      AppLog.log(
-          'StartChartManage().videoHeight:${StartChartManage().videoHeight}');
       final textureId = await VideoDecodePlugin.initDecoder(config);
       if (textureId != null) {
         Future.microtask(() => state.textureId.value = textureId);
@@ -172,15 +168,11 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
     ScpMessage scpMessage,
   ) {
     // 动态回绕阈值判断，frameSeq较小时阈值也小
-    if (!_pendingStreamReset &&
+    if (!_pendingStreamReset && _lastFrameSeq != null && frameType == TalkDataH264Frame_FrameTypeE.I && frameSeq < _lastFrameSeq!) {
-        _lastFrameSeq != null &&
-        frameType == TalkDataH264Frame_FrameTypeE.I &&
-        frameSeq < _lastFrameSeq!) {
       int dynamicThreshold = _getFrameSeqRolloverThreshold(_lastFrameSeq!);
       if ((_lastFrameSeq! - frameSeq) > dynamicThreshold) {
         // 检测到新流I帧，frameSeq大幅回绕，进入loading并重置所有本地状态
-        AppLog.log(
+        AppLog.log('检测到新流I帧，frameSeq大幅回绕，进入loading并重置: frameSeq=$frameSeq, lastFrameSeq=$_lastFrameSeq, 阈值=$dynamicThreshold');
-            '检测到新流I帧，frameSeq大幅回绕，进入loading并重置: frameSeq=$frameSeq, lastFrameSeq=$_lastFrameSeq, 阈值=$dynamicThreshold');
         Future.microtask(() => state.isLoading.value = true);
         _pendingStreamReset = true;
         // 先暂停帧处理定时器，防止竞态
@@ -197,8 +189,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         // 继续往下执行
       } else {
         // 小幅度乱序，直接丢弃
-        AppLog.log(
+        AppLog.log('检测到I帧乱序（未超过回绕阈值$dynamicThreshold），丢弃: frameSeq=$frameSeq, lastFrameSeq=$_lastFrameSeq');
-            '检测到I帧乱序（未超过回绕阈值$dynamicThreshold），丢弃: frameSeq=$frameSeq, lastFrameSeq=$_lastFrameSeq');
         return;
       }
     }
@@ -238,8 +229,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
 
     // 如果缓冲区超出最大大小，优先丢弃P/B帧
     while (state.h264FrameBuffer.length >= state.maxFrameBufferSize) {
-      int pbIndex = state.h264FrameBuffer
+      int pbIndex = state.h264FrameBuffer.indexWhere((f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.P);
-          .indexWhere((f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.P);
       if (pbIndex != -1) {
         state.h264FrameBuffer.removeAt(pbIndex);
       } else {
@@ -260,15 +250,17 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
     final int intervalMs = (1000 / state.targetFps).round();
 
     // 创建新定时器
-    state.frameProcessTimer =
+    state.frameProcessTimer = Timer.periodic(Duration(milliseconds: intervalMs), (timer) {
-        Timer.periodic(Duration(milliseconds: intervalMs), (timer) {
       _processNextFrameFromBuffer();
     });
     AppLog.log('启动帧处理定时器，目标帧率: ${state.targetFps}fps，间隔: ${intervalMs}ms');
   }
 
+  /// 从缓冲区处理下一帧
   /// 从缓冲区处理下一帧
   void _processNextFrameFromBuffer() async {
+    final startTime = DateTime.now().microsecondsSinceEpoch;
+
     // 避免重复处理
     if (state.isProcessingFrame) {
       return;
@@ -279,25 +271,19 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
       return;
     }
 
+    try {
       // 优先查找I帧，按frameSeq最小的I帧消费
-    final iFrames = state.h264FrameBuffer
+      final iFrames = state.h264FrameBuffer.where((f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.I).toList();
-        .where((f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.I)
+      iFrames.sort((a, b) => (a['frameSeq'] as int).compareTo(b['frameSeq'] as int));
-        .toList();
-    iFrames
-        .sort((a, b) => (a['frameSeq'] as int).compareTo(b['frameSeq'] as int));
 
       if (iFrames.isNotEmpty) {
-      // 有I帧，消费最小的I帧，并记录其frameSeq
         final minIFrame = iFrames.first;
         final minIFrameSeq = minIFrame['frameSeq'];
         final targetIndex = state.h264FrameBuffer.indexWhere(
-        (f) =>
+          (f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.I && f['frameSeq'] == minIFrameSeq,
-            f['frameType'] == TalkDataH264Frame_FrameTypeE.I &&
-            f['frameSeq'] == minIFrameSeq,
         );
         state.isProcessingFrame = true;
-      final Map<String, dynamic>? frameMap =
+        final Map<String, dynamic>? frameMap = state.h264FrameBuffer.removeAt(targetIndex);
-          state.h264FrameBuffer.removeAt(targetIndex);
         if (frameMap == null) {
           state.isProcessingFrame = false;
           return;
@@ -307,12 +293,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         final int? frameSeq = frameMap['frameSeq'];
         final int? frameSeqI = frameMap['frameSeqI'];
         final int? pts = frameMap['pts'];
-      final ScpMessage? scpMessage = frameMap['scpMessage'];
+        if (frameData == null || frameType == null || frameSeq == null || frameSeqI == null || pts == null) {
-      if (frameData == null ||
-          frameType == null ||
-          frameSeq == null ||
-          frameSeqI == null ||
-          pts == null) {
           state.isProcessingFrame = false;
           return;
         }
@@ -321,11 +302,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
           return;
         }
         lastDecodedIFrameSeq = minIFrameSeq;
-      // AppLog.log('送入解码器的P帧数据frameSeq:${frameSeq},frameSeqI:${frameSeqI},'
+
-      //     'frameType:${frameType},messageId:${scpMessage!.MessageId}');
-      // final spsData = NaluUtils.filterNalusByType(frameData, 7);
-      // final ppsData = NaluUtils.filterNalusByType(frameData, 8);
-      // AppLog.log('SPSDATA:${spsData}，ppsData:${ppsData}');
         await VideoDecodePlugin.sendFrame(
           frameData: frameData,
           frameType: 0,
@@ -340,24 +317,17 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
 
       // 没有I帧时，只消费refIFrameSeq等于lastDecodedIFrameSeq的P帧
       if (lastDecodedIFrameSeq != null) {
-      final validPFrames = state.h264FrameBuffer
+        final validPFrames =
-          .where((f) =>
+            state.h264FrameBuffer.where((f) => f['frameType'] == TalkDataH264Frame_FrameTypeE.P && f['frameSeqI'] == lastDecodedIFrameSeq).toList();
-              f['frameType'] == TalkDataH264Frame_FrameTypeE.P &&
-              f['frameSeqI'] == lastDecodedIFrameSeq)
-          .toList();
         if (validPFrames.isNotEmpty) {
-        validPFrames.sort(
+          validPFrames.sort((a, b) => (a['frameSeq'] as int).compareTo(b['frameSeq'] as int));
-            (a, b) => (a['frameSeq'] as int).compareTo(b['frameSeq'] as int));
           final minPFrame = validPFrames.first;
           final targetIndex = state.h264FrameBuffer.indexWhere(
             (f) =>
-              f['frameType'] == TalkDataH264Frame_FrameTypeE.P &&
+                f['frameType'] == TalkDataH264Frame_FrameTypeE.P && f['frameSeq'] == minPFrame['frameSeq'] && f['frameSeqI'] == lastDecodedIFrameSeq,
-              f['frameSeq'] == minPFrame['frameSeq'] &&
-              f['frameSeqI'] == lastDecodedIFrameSeq,
           );
           state.isProcessingFrame = true;
-        final Map<String, dynamic>? frameMap =
+          final Map<String, dynamic>? frameMap = state.h264FrameBuffer.removeAt(targetIndex);
-            state.h264FrameBuffer.removeAt(targetIndex);
           if (frameMap == null) {
             state.isProcessingFrame = false;
             return;
@@ -367,12 +337,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
           final int? frameSeq = frameMap['frameSeq'];
           final int? frameSeqI = frameMap['frameSeqI'];
           final int? pts = frameMap['pts'];
-        final ScpMessage? scpMessage = frameMap['scpMessage'];
+          if (frameData == null || frameType == null || frameSeq == null || frameSeqI == null || pts == null) {
-        if (frameData == null ||
-            frameType == null ||
-            frameSeq == null ||
-            frameSeqI == null ||
-            pts == null) {
             state.isProcessingFrame = false;
             return;
           }
@@ -380,8 +345,6 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
             state.isProcessingFrame = false;
             return;
           }
-        // AppLog.log('送入解码器的I帧数据frameSeq:${frameSeq},frameSeqI:${frameSeqI},'
-        //     'frameType:${frameType},messageId:${scpMessage!.MessageId}');
 
           await VideoDecodePlugin.sendFrame(
             frameData: frameData,
@@ -396,6 +359,16 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         }
       }
       // 其他情况不消费，等待I帧到来
+    } finally {
+      final endTime = DateTime.now().microsecondsSinceEpoch;
+      final durationMs = (endTime - startTime) / 1000.0;
+      // 可选：只在耗时较长时打印（例如 > 5ms）
+      if (durationMs > 5) {
+        debugPrint('[_processNextFrameFromBuffer] 耗时: ${durationMs.toStringAsFixed(2)} ms');
+        // 或使用你的日志系统，如：
+        // AppLog.log('Frame processing took ${durationMs.toStringAsFixed(2)} ms');
+      }
+    }
   }
 
   /// 停止帧处理定时器
@@ -427,8 +400,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
     AppLog.log("==== 启动新的数据流监听 ====");
     _isListening = true;
 
-    _streamSubscription = state.talkDataRepository.talkDataStream
+    _streamSubscription = state.talkDataRepository.talkDataStream.listen((TalkDataModel talkDataModel) async {
-        .listen((TalkDataModel talkDataModel) async {
       _processFrame(talkDataModel);
     });
   }
@@ -437,8 +409,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
   void _playAudioFrames() {
     // 如果缓冲区为空或未达到目标大小，不进行播放
     // 音频缓冲区要求更小，以减少延迟
-    if (state.audioBuffer.isEmpty ||
+    if (state.audioBuffer.isEmpty || state.audioBuffer.length < audioBufferSize) {
-        state.audioBuffer.length < audioBufferSize) {
       return;
     }
 
@@ -446,8 +417,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
     TalkData? oldestFrame;
     int oldestIndex = -1;
     for (int i = 0; i < state.audioBuffer.length; i++) {
-      if (oldestFrame == null ||
+      if (oldestFrame == null || state.audioBuffer[i].durationMs < oldestFrame.durationMs) {
-          state.audioBuffer[i].durationMs < oldestFrame.durationMs) {
         oldestFrame = state.audioBuffer[i];
         oldestIndex = i;
       }
@@ -477,8 +447,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
           break;
         case TalkStatus.answeredSuccessfully:
           state.oneMinuteTimeTimer?.cancel(); // 取消旧定时器
-          state.oneMinuteTimeTimer ??=
+          state.oneMinuteTimeTimer ??= Timer.periodic(const Duration(seconds: 1), (Timer t) {
-              Timer.periodic(const Duration(seconds: 1), (Timer t) {
             if (state.isLoading.isFalse) {
               state.oneMinuteTime.value++;
             }
@@ -493,9 +462,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
 
   /// 播放音频数据
   void _playAudioData(TalkData talkData) async {
-    if (state.isOpenVoice.value &&
+    if (state.isOpenVoice.value && state.isLoading.isFalse && state.isRecordingAudio.value == false) {
-        state.isLoading.isFalse &&
-        state.isRecordingAudio.value == false) {
       List<int> encodedData = G711Tool.decode(talkData.content, 0); // 0表示A-law
       // 将 PCM 数据转换为 PcmArrayInt16
       final PcmArrayInt16 fromList = PcmArrayInt16.fromList(encodedData);
@@ -670,11 +637,9 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         AppLog.log('截图失败: 未找到当前上下文');
         return;
       }
-      final RenderRepaintBoundary boundary = state.globalKey.currentContext!
+      final RenderRepaintBoundary boundary = state.globalKey.currentContext!.findRenderObject()! as RenderRepaintBoundary;
-          .findRenderObject()! as RenderRepaintBoundary;
       final ui.Image image = await boundary.toImage();
-      final ByteData? byteData =
+      final ByteData? byteData = await image.toByteData(format: ui.ImageByteFormat.png);
-          await image.toByteData(format: ui.ImageByteFormat.png);
 
       if (byteData == null) {
         AppLog.log('截图失败: 图像数据为空');
@@ -702,15 +667,13 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
 
 // 远程开锁
   Future<void> remoteOpenLock() async {
-    final LockListInfoItemEntity currentKeyInfo =
+    final LockListInfoItemEntity currentKeyInfo = CommonDataManage().currentKeyInfo;
-        CommonDataManage().currentKeyInfo;
 
     var lockId = currentKeyInfo.lockId ?? 0;
     var remoteUnlock = currentKeyInfo.lockSetting?.remoteUnlock ?? 0;
 
     final lockPeerId = StartChartManage().lockPeerId;
-    final LockListInfoGroupEntity? lockListInfoGroupEntity =
+    final LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData();
-        await Storage.getLockMainListData();
     if (lockListInfoGroupEntity != null) {
       lockListInfoGroupEntity!.groupList?.forEach((element) {
         final lockList = element.lockList;
@@ -728,8 +691,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
       });
     }
     if (remoteUnlock == 1) {
-      final LoginEntity entity = await ApiRepository.to
+      final LoginEntity entity = await ApiRepository.to.remoteOpenLock(lockId: lockId.toString(), timeOut: 60);
-          .remoteOpenLock(lockId: lockId.toString(), timeOut: 60);
       if (entity.errorCode!.codeIsSuccessful) {
         showToast('已开锁'.tr);
         StartChartManage().lockListPeerId = [];
@@ -756,8 +718,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
         state.startRecordingAudioTime.value = DateTime.now();
 
         // 增加录音帧监听器和错误监听器
-        state.voiceProcessor
+        state.voiceProcessor?.addFrameListeners(<VoiceProcessorFrameListener>[_onFrame]);
-            ?.addFrameListeners(<VoiceProcessorFrameListener>[_onFrame]);
         state.voiceProcessor?.addErrorListener(_onError);
       } else {
         // state.errorMessage.value = 'Recording permission not granted';
@@ -777,8 +738,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
       state.endRecordingAudioTime.value = DateTime.now();
 
       // 计算录音的持续时间
-      final Duration duration = state.endRecordingAudioTime.value
+      final Duration duration = state.endRecordingAudioTime.value.difference(state.startRecordingAudioTime.value);
-          .difference(state.startRecordingAudioTime.value);
 
       state.recordingAudioTime.value = duration.inSeconds;
     } on PlatformException catch (ex) {
@@ -848,10 +808,8 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
     _bufferedAudioFrames.addAll(encodedData);
 
     // 启动定时发送器（仅启动一次）
-    if (_startProcessingAudioTimer == null &&
+    if (_startProcessingAudioTimer == null && _bufferedAudioFrames.length > chunkSize) {
-        _bufferedAudioFrames.length > chunkSize) {
+      _startProcessingAudioTimer = Timer.periodic(Duration(milliseconds: intervalMs), _sendAudioChunk);
-      _startProcessingAudioTimer =
-          Timer.periodic(Duration(milliseconds: intervalMs), _sendAudioChunk);
     }
   }
 
@@ -887,8 +845,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
     }
 
     /// 修改发送预期数据
-    StartChartManage().changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(
+    StartChartManage().changeTalkExpectDataTypeAndReStartTalkExpectMessageTimer(talkExpect: talkExpectReq);
-        talkExpect: talkExpectReq);
 
     // 不立即loading，继续解码旧流帧，等待frameSeq回绕检测
     // 仅重置frameSeq回绕检测标志

lib/talk/starChart/views/native/talk_view_native_decode_page.dart

@@ -29,15 +29,12 @@ class TalkViewNativeDecodePage extends StatefulWidget {
   const TalkViewNativeDecodePage({Key? key}) : super(key: key);
 
   @override
-  State<TalkViewNativeDecodePage> createState() =>
+  State<TalkViewNativeDecodePage> createState() => _TalkViewNativeDecodePageState();
-      _TalkViewNativeDecodePageState();
 }
 
-class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
+class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage> with TickerProviderStateMixin {
-    with TickerProviderStateMixin {
   final TalkViewNativeDecodeLogic logic = Get.put(TalkViewNativeDecodeLogic());
-  final TalkViewNativeDecodeState state =
+  final TalkViewNativeDecodeState state = Get.find<TalkViewNativeDecodeLogic>().state;
-      Get.find<TalkViewNativeDecodeLogic>().state;
   final startChartManage = StartChartManage();
 
   @override
@@ -69,56 +66,39 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
         // 返回 false 表示禁止退出
         return false;
       },
-      child: SizedBox(
+      child: Container(
         width: 1.sw,
         height: 1.sh,
+        color: Colors.black.withOpacity(0.7),
         child: Stack(
           alignment: Alignment.center,
           children: <Widget>[
             // 悬浮帧率统计信息条
             Obx(
               () {
-                final double screenWidth = MediaQuery.of(context).size.width;
-                final double screenHeight = MediaQuery.of(context).size.height;
-
-                final double logicalWidth = MediaQuery.of(context).size.width;
-                final double logicalHeight = MediaQuery.of(context).size.height;
-                final double devicePixelRatio =
-                    MediaQuery.of(context).devicePixelRatio;
-
-                // 计算物理像素值
-                final double physicalWidth = logicalWidth * devicePixelRatio;
-                final double physicalHeight = logicalHeight * devicePixelRatio;
-
-                // 旋转后的图片尺寸
-                const int rotatedImageWidth = 480; // 原始高度
-                const int rotatedImageHeight = 864; // 原始宽度
-
-                // 计算缩放比例
-                final double scaleWidth = physicalWidth / rotatedImageWidth;
-                final double scaleHeight = physicalHeight / rotatedImageHeight;
-                max(scaleWidth, scaleHeight); // 选择较大的缩放比例
                 // 防御性处理：只要loading中或textureId为null，优先渲染loading/占位
                 if (state.isLoading.isTrue || state.textureId.value == null) {
                   return Image.asset(
                     'images/main/monitorBg.png',
-                    width: screenWidth,
+                    width: 1.sw,
-                    height: screenHeight,
+                    height: 1.sh,
                     fit: BoxFit.cover,
                   );
                 } else {
-                  return Positioned.fill(
+                  return Positioned(
+                    top: 0,
+                    left: 0,
+                    right: 0,
                     child: PopScope(
                       canPop: false,
                       child: RepaintBoundary(
                         key: state.globalKey,
-                        child: SizedBox.expand(
                         child: RotatedBox(
                           // 解码器不支持硬件旋转，使用RotatedBox
                           quarterTurns: startChartManage.rotateAngle ~/ 90,
-                              child: Platform.isIOS
+                          child: state.isFullScreen.isFalse
-                                  ? Transform.scale(
+                              ? AspectRatio(
-                                      scale: 1.008, // 轻微放大，消除iOS白边
+                                  aspectRatio: StartChartManage().videoWidth / StartChartManage().videoHeight,
                                   child: Texture(
                                     textureId: state.textureId.value!,
                                     filterQuality: FilterQuality.medium,
@@ -131,7 +111,6 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                         ),
                       ),
                     ),
-                    ),
                   );
                 }
               },
@@ -151,19 +130,14 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                     width: 1.sw,
                     child: Obx(
                       () {
-                        final String sec = (state.oneMinuteTime.value % 60)
+                        final String sec = (state.oneMinuteTime.value % 60).toString().padLeft(2, '0');
-                            .toString()
+                        final String min = (state.oneMinuteTime.value ~/ 60).toString().padLeft(2, '0');
-                            .padLeft(2, '0');
-                        final String min = (state.oneMinuteTime.value ~/ 60)
-                            .toString()
-                            .padLeft(2, '0');
                         return Row(
                           mainAxisAlignment: MainAxisAlignment.center,
                           children: <Widget>[
                             Text(
                               '$min:$sec',
-                              style: TextStyle(
+                              style: TextStyle(fontSize: 26.sp, color: Colors.white),
-                                  fontSize: 26.sp, color: Colors.white),
                             ),
                           ],
                         );
@@ -177,9 +151,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                 width: 1.sw - 30.w * 2,
                 // height: 300.h,
                 margin: EdgeInsets.all(30.w),
-                decoration: BoxDecoration(
+                decoration: BoxDecoration(color: Colors.black.withOpacity(0.2), borderRadius: BorderRadius.circular(20.h)),
-                    color: Colors.black.withOpacity(0.2),
-                    borderRadius: BorderRadius.circular(20.h)),
                 child: Column(
                   children: <Widget>[
                     SizedBox(height: 20.h),
@@ -191,9 +163,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                 ),
               ),
             ),
-            Obx(() => state.isLoading.isTrue
+            Obx(() => state.isLoading.isTrue ? buildRotationTransition() : Container()),
-                ? buildRotationTransition()
-                : Container()),
             Obx(() => state.isLongPressing.value
                 ? Positioned(
                     top: 80.h,
@@ -213,8 +183,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                             SizedBox(width: 10.w),
                             Text(
                               '正在说话...'.tr,
-                              style: TextStyle(
+                              style: TextStyle(fontSize: 20.sp, color: Colors.white),
-                                  fontSize: 20.sp, color: Colors.white),
                             ),
                           ],
                         ),
@@ -246,10 +215,8 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
               width: 40.w,
               height: 40.w,
               image: state.isOpenVoice.value
-                  ? const AssetImage(
+                  ? const AssetImage('images/main/icon_lockDetail_monitoringOpenVoice.png')
-                      'images/main/icon_lockDetail_monitoringOpenVoice.png')
+                  : const AssetImage('images/main/icon_lockDetail_monitoringCloseVoice.png'))),
-                  : const AssetImage(
-                      'images/main/icon_lockDetail_monitoringCloseVoice.png'))),
         ),
       ),
       SizedBox(width: 50.w),
@@ -264,11 +231,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
           width: 50.w,
           height: 50.w,
           padding: EdgeInsets.all(5.w),
-          child: Image(
+          child: Image(width: 40.w, height: 40.w, image: const AssetImage('images/main/icon_lockDetail_monitoringScreenshot.png')),
-              width: 40.w,
-              height: 40.w,
-              image: const AssetImage(
-                  'images/main/icon_lockDetail_monitoringScreenshot.png')),
         ),
       ),
       SizedBox(width: 50.w),
@@ -293,8 +256,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
             width: 40.w,
             height: 40.w,
             fit: BoxFit.fill,
-            image: const AssetImage(
+            image: const AssetImage('images/main/icon_lockDetail_monitoringScreenRecording.png'),
-                'images/main/icon_lockDetail_monitoringScreenRecording.png'),
           ),
         ),
       ),
@@ -330,13 +292,8 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
                                   Text(
                                     q,
                                     style: TextStyle(
-                                      color: state.currentQuality.value == q
+                                      color: state.currentQuality.value == q ? AppColors.mainColor : Colors.black,
-                                          ? AppColors.mainColor
+                                      fontWeight: state.currentQuality.value == q ? FontWeight.bold : FontWeight.normal,
-                                          : Colors.black,
-                                      fontWeight:
-                                          state.currentQuality.value == q
-                                              ? FontWeight.bold
-                                              : FontWeight.normal,
                                       fontSize: 28.sp,
                                     ),
                                   ),
@@ -352,8 +309,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
           );
         },
         child: Container(
-          child: Icon(Icons.high_quality_outlined,
+          child: Icon(Icons.high_quality_outlined, color: Colors.white, size: 38.w),
-              color: Colors.white, size: 38.w),
         ),
       ),
       Visibility(
@@ -377,9 +333,7 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
   }
 
   Widget bottomBottomBtnWidget() {
-    return Row(
+    return Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: <Widget>[
-        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-        children: <Widget>[
       // 接听
       Obx(
         () => bottomBtnItemWidget(
@@ -399,17 +353,14 @@ class _TalkViewNativeDecodePageState extends State<TalkViewNativeDecodePage>
             state.isLongPressing.value = false;
           },
           onClick: () async {
-                if (state.talkStatus.value ==
+            if (state.talkStatus.value == TalkStatus.passiveCallWaitingAnswer) {
-                    TalkStatus.passiveCallWaitingAnswer) {
               // 接听
               logic.initiateAnswerCommand();
             }
           },
         ),
       ),
-          bottomBtnItemWidget(
+      bottomBtnItemWidget('images/main/icon_lockDetail_hangUp.png', '挂断'.tr, Colors.red, onClick: () {
-              'images/main/icon_lockDetail_hangUp.png', '挂断'.tr, Colors.red,
-              onClick: () {
         // 挂断
         logic.udpHangUpAction();
       }),

lib/talk/starChart/views/native/talk_view_native_decode_page_debug.dart

@@ -0,0 +1,518 @@
+import 'dart:async';
+import 'dart:math';
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:http/http.dart' as http;
+import 'package:provider/provider.dart';
+import 'package:star_lock/appRouters.dart';
+import 'package:star_lock/flavors.dart';
+import 'package:star_lock/talk/call/callTalk.dart';
+import 'package:star_lock/talk/starChart/constant/talk_status.dart';
+import 'package:star_lock/talk/starChart/handle/impl/debug_Info_model.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_data_handler.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
+import 'package:star_lock/talk/starChart/views/native/talk_view_native_decode_logic.dart';
+import 'package:star_lock/talk/starChart/views/native/talk_view_native_decode_state.dart';
+import 'package:star_lock/talk/starChart/views/talkView/talk_view_logic.dart';
+import 'package:star_lock/talk/starChart/views/talkView/talk_view_state.dart';
+import 'package:video_decode_plugin/video_decode_plugin.dart';
+
+import '../../../../app_settings/app_colors.dart';
+import '../../../../tools/showTFView.dart';
+
+class TalkViewNativeDecodePageDebug extends StatefulWidget {
+  const TalkViewNativeDecodePageDebug({Key? key}) : super(key: key);
+
+  @override
+  State<TalkViewNativeDecodePageDebug> createState() => _TalkViewNativeDecodePageDebugState();
+}
+
+class _TalkViewNativeDecodePageDebugState extends State<TalkViewNativeDecodePageDebug> with TickerProviderStateMixin {
+  final TalkViewNativeDecodeLogic logic = Get.put(TalkViewNativeDecodeLogic());
+  final TalkViewNativeDecodeState state = Get.find<TalkViewNativeDecodeLogic>().state;
+  final startChartManage = StartChartManage();
+
+  @override
+  void initState() {
+    super.initState();
+
+    state.animationController = AnimationController(
+      vsync: this, // 确保使用的TickerProvider是当前Widget
+      duration: const Duration(seconds: 1),
+    );
+
+    state.animationController.repeat();
+    //动画开始、结束、向前移动或向后移动时会调用StatusListener
+    state.animationController.addStatusListener((AnimationStatus status) {
+      if (status == AnimationStatus.completed) {
+        state.animationController.reset();
+        state.animationController.forward();
+      } else if (status == AnimationStatus.dismissed) {
+        state.animationController.reset();
+        state.animationController.forward();
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return WillPopScope(
+      onWillPop: () async {
+        // 返回 false 表示禁止退出
+        return false;
+      },
+      child: Container(
+        width: 1.sw,
+        height: 1.sh,
+        color: Colors.black.withOpacity(0.7),
+        child: Stack(
+          alignment: Alignment.center,
+          children: <Widget>[
+            // 悬浮帧率统计信息条
+            Obx(
+              () {
+                final double screenWidth = MediaQuery.of(context).size.width;
+                final double screenHeight = MediaQuery.of(context).size.height;
+
+                // 防御性处理：只要loading中或textureId为null，优先渲染loading/占位
+                if (state.isLoading.isTrue || state.textureId.value == null) {
+                  return Image.asset(
+                    'images/main/monitorBg.png',
+                    width: screenWidth,
+                    height: screenHeight,
+                    fit: BoxFit.cover,
+                  );
+                } else {
+                  return PopScope(
+                    canPop: false,
+                    child: RepaintBoundary(
+                      key: state.globalKey,
+                      child: RotatedBox(
+                        // 解码器不支持硬件旋转，使用RotatedBox
+                        quarterTurns: startChartManage.rotateAngle ~/ 90,
+                        child: Platform.isIOS
+                            ? Transform.scale(
+                                scale: 1.008, // 轻微放大，消除iOS白边
+                                child: Texture(
+                                  textureId: state.textureId.value!,
+                                  filterQuality: FilterQuality.medium,
+                                ),
+                              )
+                            : state.isFullScreen.isFalse
+                                ? AspectRatio(
+                                    aspectRatio: StartChartManage().videoWidth / StartChartManage().videoHeight,
+                                    child: Texture(
+                                      textureId: state.textureId.value!,
+                                      filterQuality: FilterQuality.medium,
+                                    ),
+                                  )
+                                : Texture(
+                                    textureId: state.textureId.value!,
+                                    filterQuality: FilterQuality.medium,
+                                  ),
+                      ),
+                    ),
+                  );
+                }
+              },
+            ),
+            ElevatedButton(
+              onPressed: () {
+                state.isFullScreen.value = !state.isFullScreen.value;
+              },
+              child: Obx(
+                () => Text(state.isFullScreen.isTrue ? '退出全屏' : '全屏'),
+              ),
+            ),
+            Obx(() => state.isLoading.isTrue
+                ? Positioned(
+                    bottom: 310.h,
+                    child: Text(
+                      '正在创建安全连接...'.tr,
+                      style: TextStyle(color: Colors.black, fontSize: 26.sp),
+                    ))
+                : Container()),
+            Obx(() => state.isLoading.isFalse && state.oneMinuteTime.value > 0
+                ? Positioned(
+                    top: ScreenUtil().statusBarHeight + 75.h,
+                    width: 1.sw,
+                    child: Obx(
+                      () {
+                        final String sec = (state.oneMinuteTime.value % 60).toString().padLeft(2, '0');
+                        final String min = (state.oneMinuteTime.value ~/ 60).toString().padLeft(2, '0');
+                        return Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: <Widget>[
+                            Text(
+                              '$min:$sec',
+                              style: TextStyle(fontSize: 26.sp, color: Colors.white),
+                            ),
+                          ],
+                        );
+                      },
+                    ),
+                  )
+                : Container()),
+            Positioned(
+              bottom: 10.w,
+              child: Container(
+                width: 1.sw - 30.w * 2,
+                // height: 300.h,
+                margin: EdgeInsets.all(30.w),
+                decoration: BoxDecoration(color: Colors.black.withOpacity(0.2), borderRadius: BorderRadius.circular(20.h)),
+                child: Column(
+                  children: <Widget>[
+                    SizedBox(height: 20.h),
+                    bottomTopBtnWidget(),
+                    SizedBox(height: 20.h),
+                    bottomBottomBtnWidget(),
+                    SizedBox(height: 20.h),
+                  ],
+                ),
+              ),
+            ),
+            Obx(() => state.isLoading.isTrue ? buildRotationTransition() : Container()),
+            Obx(() => state.isLongPressing.value
+                ? Positioned(
+                    top: 80.h,
+                    left: 0,
+                    right: 0,
+                    child: Center(
+                      child: Container(
+                        padding: EdgeInsets.all(10.w),
+                        decoration: BoxDecoration(
+                          color: Colors.black.withOpacity(0.7),
+                          borderRadius: BorderRadius.circular(10.w),
+                        ),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: <Widget>[
+                            Icon(Icons.mic, color: Colors.white, size: 24.w),
+                            SizedBox(width: 10.w),
+                            Text(
+                              '正在说话...'.tr,
+                              style: TextStyle(fontSize: 20.sp, color: Colors.white),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  )
+                : Container()),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget bottomTopBtnWidget() {
+    return Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
+      // 打开关闭声音
+      GestureDetector(
+        onTap: () {
+          if (state.talkStatus.value == TalkStatus.answeredSuccessfully) {
+            // 打开关闭声音
+            logic.updateTalkExpect();
+          }
+        },
+        child: Container(
+          width: 50.w,
+          height: 50.w,
+          padding: EdgeInsets.all(5.w),
+          child: Obx(() => Image(
+              width: 40.w,
+              height: 40.w,
+              image: state.isOpenVoice.value
+                  ? const AssetImage('images/main/icon_lockDetail_monitoringOpenVoice.png')
+                  : const AssetImage('images/main/icon_lockDetail_monitoringCloseVoice.png'))),
+        ),
+      ),
+      SizedBox(width: 50.w),
+      // 截图
+      GestureDetector(
+        onTap: () async {
+          if (state.talkStatus.value == TalkStatus.answeredSuccessfully) {
+            await logic.captureAndSavePng();
+          }
+        },
+        child: Container(
+          width: 50.w,
+          height: 50.w,
+          padding: EdgeInsets.all(5.w),
+          child: Image(width: 40.w, height: 40.w, image: const AssetImage('images/main/icon_lockDetail_monitoringScreenshot.png')),
+        ),
+      ),
+      SizedBox(width: 50.w),
+      // 录制
+      GestureDetector(
+        onTap: () async {
+          logic.showToast('功能暂未开放'.tr);
+          // if (
+          //     state.talkStatus.value == TalkStatus.answeredSuccessfully) {
+          //   if (state.isRecordingScreen.value) {
+          //     await logic.stopRecording();
+          //   } else {
+          //     await logic.startRecording();
+          //   }
+          // }
+        },
+        child: Container(
+          width: 50.w,
+          height: 50.w,
+          padding: EdgeInsets.all(5.w),
+          child: Image(
+            width: 40.w,
+            height: 40.w,
+            fit: BoxFit.fill,
+            image: const AssetImage('images/main/icon_lockDetail_monitoringScreenRecording.png'),
+          ),
+        ),
+      ),
+      SizedBox(width: 50.w),
+      // 清晰度切换按钮
+      GestureDetector(
+        onTap: () async {
+          // 弹出底部弹出层，选择清晰度
+          showModalBottomSheet(
+            context: context,
+            backgroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.vertical(top: Radius.circular(20.w)),
+            ),
+            builder: (BuildContext context) {
+              final List<String> qualities = ['高清', '标清'];
+              return SafeArea(
+                child: SingleChildScrollView(
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: qualities.map((q) {
+                      return Obx(() => InkWell(
+                            onTap: () {
+                              Navigator.of(context).pop();
+                              logic.onQualityChanged(q);
+                            },
+                            child: Container(
+                              padding: EdgeInsets.symmetric(vertical: 18.w),
+                              child: Row(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                mainAxisSize: MainAxisSize.max,
+                                children: [
+                                  Text(
+                                    q,
+                                    style: TextStyle(
+                                      color: state.currentQuality.value == q ? AppColors.mainColor : Colors.black,
+                                      fontWeight: state.currentQuality.value == q ? FontWeight.bold : FontWeight.normal,
+                                      fontSize: 28.sp,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ));
+                    }).toList(),
+                  ),
+                ),
+              );
+            },
+          );
+        },
+        child: Container(
+          child: Icon(Icons.high_quality_outlined, color: Colors.white, size: 38.w),
+        ),
+      ),
+      Visibility(
+        visible: state.currentLanguage == 'zh_CN' && Platform.isAndroid,
+        child: SizedBox(width: 38.w),
+      ),
+      Visibility(
+        visible: state.currentLanguage == 'zh_CN' && Platform.isAndroid,
+        child: IconButton(
+          icon: Icon(
+            Icons.notification_add_sharp,
+            size: 32.w,
+            color: Colors.white,
+          ),
+          onPressed: () {
+            Get.toNamed(Routers.permissionGuidancePage);
+          },
+        ),
+      )
+    ]);
+  }
+
+  Widget bottomBottomBtnWidget() {
+    return Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: <Widget>[
+      // 接听
+      Obx(
+        () => bottomBtnItemWidget(
+          getAnswerBtnImg(),
+          getAnswerBtnName(),
+          Colors.white,
+          longPress: () async {
+            if (state.talkStatus.value == TalkStatus.answeredSuccessfully) {
+              // 启动录音
+              logic.startProcessingAudio();
+              state.isLongPressing.value = true;
+            }
+          },
+          longPressUp: () async {
+            // 停止录音
+            logic.stopProcessingAudio();
+            state.isLongPressing.value = false;
+          },
+          onClick: () async {
+            if (state.talkStatus.value == TalkStatus.passiveCallWaitingAnswer) {
+              // 接听
+              logic.initiateAnswerCommand();
+            }
+          },
+        ),
+      ),
+      bottomBtnItemWidget('images/main/icon_lockDetail_hangUp.png', '挂断'.tr, Colors.red, onClick: () {
+        // 挂断
+        logic.udpHangUpAction();
+      }),
+      bottomBtnItemWidget(
+        'images/main/icon_lockDetail_monitoringUnlock.png',
+        '开锁'.tr,
+        AppColors.mainColor,
+        onClick: () {
+          // if (state.talkStatus.value == TalkStatus.answeredSuccessfully &&
+          //     state.listData.value.length > 0) {
+          // logic.udpOpenDoorAction();
+          // }
+          // if (UDPManage().remoteUnlock == 1) {
+          // logic.udpOpenDoorAction();
+          // showDeletPasswordAlertDialog(context);
+          // } else {
+          //   logic.showToast('请在锁设置中开启远程开锁'.tr);
+          // }
+          logic.remoteOpenLock();
+        },
+      )
+    ]);
+  }
+
+  String getAnswerBtnImg() {
+    switch (state.talkStatus.value) {
+      case TalkStatus.passiveCallWaitingAnswer:
+        return 'images/main/icon_lockDetail_monitoringAnswerCalls.png';
+      case TalkStatus.answeredSuccessfully:
+      case TalkStatus.proactivelyCallWaitingAnswer:
+        return 'images/main/icon_lockDetail_monitoringUnTalkback.png';
+      default:
+        return 'images/main/icon_lockDetail_monitoringAnswerCalls.png';
+    }
+  }
+
+  String getAnswerBtnName() {
+    switch (state.talkStatus.value) {
+      case TalkStatus.passiveCallWaitingAnswer:
+        return '接听'.tr;
+      case TalkStatus.proactivelyCallWaitingAnswer:
+      case TalkStatus.answeredSuccessfully:
+        return '长按说话'.tr;
+      default:
+        return '接听'.tr;
+    }
+  }
+
+  Widget bottomBtnItemWidget(
+    String iconUrl,
+    String name,
+    Color backgroundColor, {
+    required Function() onClick,
+    Function()? longPress,
+    Function()? longPressUp,
+  }) {
+    double wh = 80.w;
+    return GestureDetector(
+      onTap: onClick,
+      onLongPress: longPress,
+      onLongPressUp: longPressUp,
+      child: SizedBox(
+        height: 160.w,
+        width: 140.w,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: <Widget>[
+            Container(
+              width: wh,
+              height: wh,
+              constraints: BoxConstraints(
+                minWidth: wh,
+              ),
+              decoration: BoxDecoration(
+                color: backgroundColor,
+                borderRadius: BorderRadius.circular((wh + 10.w * 2) / 2),
+              ),
+              padding: EdgeInsets.all(20.w),
+              child: Image.asset(iconUrl, fit: BoxFit.fitWidth),
+            ),
+            SizedBox(height: 20.w),
+            Text(
+              name,
+              style: TextStyle(fontSize: 20.sp, color: Colors.white),
+              textAlign: TextAlign.center, // 当文本超出指定行数时，使用省略号表示
+              maxLines: 2, // 设置最大行数为1
+            )
+          ],
+        ),
+      ),
+    );
+  }
+
+  // 根据丢包率返回对应的颜色
+  Color _getPacketLossColor(double lossRate) {
+    if (lossRate < 1.0) {
+      return Colors.green; // 丢包率低于1%显示绿色
+    } else if (lossRate < 5.0) {
+      return Colors.yellow; // 丢包率1%-5%显示黄色
+    } else if (lossRate < 10.0) {
+      return Colors.orange; // 丢包率5%-10%显示橙色
+    } else {
+      return Colors.red; // 丢包率高于10%显示红色
+    }
+  }
+
+  //旋转动画
+  Widget buildRotationTransition() {
+    return Positioned(
+      left: ScreenUtil().screenWidth / 2 - 220.w / 2,
+      top: ScreenUtil().screenHeight / 2 - 220.w / 2 - 150.h,
+      child: GestureDetector(
+        child: RotationTransition(
+          //设置动画的旋转中心
+          alignment: Alignment.center,
+          //动画控制器
+          turns: state.animationController,
+          //将要执行动画的子view
+          child: AnimatedOpacity(
+            opacity: 0.5,
+            duration: const Duration(seconds: 2),
+            child: Image.asset(
+              'images/main/realTime_connecting.png',
+              width: 220.w,
+              height: 220.w,
+            ),
+          ),
+        ),
+        onTap: () {
+          state.animationController.forward();
+        },
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    state.animationController.dispose();
+    CallTalk().finishAVData();
+    super.dispose();
+  }
+}

lib/talk/starChart/views/native/talk_view_native_decode_state.dart

@@ -37,8 +37,7 @@ class TalkViewNativeDecodeState {
   Future<String?> userMobileIP = NetworkInfo().getWifiIP();
   Future<String?> userUid = Storage.getUid();
 
-  RxInt udpStatus =
+  RxInt udpStatus = 0.obs; //0：初始状态 1：等待监视 2：  3：监视中 4：呼叫成功 5：主角通话中  6：被叫通话  8：被叫通话中 9：长按说话
-      0.obs; //0：初始状态 1：等待监视 2：  3：监视中 4：呼叫成功 5：主角通话中  6：被叫通话  8：被叫通话中 9：长按说话
   TextEditingController passwordTF = TextEditingController();
 
   RxList<int> listAudioData = <int>[].obs; //得到的音频流字节数据
@@ -63,13 +62,12 @@ class TalkViewNativeDecodeState {
   RxBool isPlaying = false.obs; // 是否开始播放
   Rx<TalkStatus> talkStatus = TalkStatus.none.obs; //星图对讲状态
   // 获取 startChartTalkStatus 的唯一实例
-  final StartChartTalkStatus startChartTalkStatus =
+  final StartChartTalkStatus startChartTalkStatus = StartChartTalkStatus.instance;
-      StartChartTalkStatus.instance;
 
   // 通话数据流的单例流数据处理类
   final TalkDataRepository talkDataRepository = TalkDataRepository.instance;
 
-  RxBool isOpenVoice = true.obs; // 是否打开声音
+  RxBool isOpenVoice = false.obs; // 是否打开声音
   RxBool isRecordingScreen = false.obs; // 是否录屏中
   RxBool isRecordingAudio = false.obs; // 是否录音中
   Rx<DateTime> startRecordingAudioTime = DateTime.now().obs; // 开始录音时间
@@ -81,6 +79,7 @@ class TalkViewNativeDecodeState {
   RxBool isLongPressing = false.obs; // 旋转角度（以弧度为单位）
   // 视频解码器纹理ID
   Rx<int?> textureId = Rx<int?>(null);
+
   // FPS监测相关变量
 
   RxInt lastFpsUpdateTime = 0.obs; // 上次FPS更新时间
@@ -110,8 +109,8 @@ class TalkViewNativeDecodeState {
 
   // H264帧缓冲区相关
   final List<Map<String, dynamic>> h264FrameBuffer = <Map<String, dynamic>>[]; // H264帧缓冲区，存储帧数据和类型
-  final int maxFrameBufferSize = 50; // 最大缓冲区大小
+  final int maxFrameBufferSize = 25; // 最大缓冲区大小
-  final int targetFps = 60; // 目标解码帧率,只是为了快速填充native的缓冲区
+  final int targetFps = 25; // 目标解码帧率,只是为了快速填充native的缓冲区
   Timer? frameProcessTimer; // 帧处理定时器
   bool isProcessingFrame = false; // 是否正在处理帧
   int lastProcessedTimestamp = 0; // 上次处理帧的时间戳
@@ -122,6 +121,8 @@ class TalkViewNativeDecodeState {
   // 当前清晰度选项，初始为'高清'
   RxString currentQuality = '高清'.obs; // 可选：高清、标清、流畅
 
-  RxString currentLanguage =
+  RxString currentLanguage = CurrentLocaleTool.getCurrentLocaleString().obs; // 当前选择语言
-      CurrentLocaleTool.getCurrentLocaleString().obs; // 当前选择语言
+
+// 是否拉伸至全屏
+  RxBool isFullScreen = false.obs;
 }

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
@@ -321,6 +322,7 @@ flutter:
   assets:
     - images/
     - images/tabbar/
+    - images/other/
     - images/guide/
     - images/main/
     - images/main/addFingerprint/