Merge branch 'develop_sky' into 'canary_release_sky'

Develop sky See merge request StarlockTeam/app-starlock!274
2025-09-04 09:19:35 +00:00 · 2025-09-04 09:19:35 +00:00 · 472a6f20d3
commit 472a6f20d3
parent eb3d53c0af 1b611ca9de
6 changed files with 103 additions and 82 deletions
--- a/lib/app.dart
+++ b/lib/app.dart
@ -144,7 +144,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
        break;
      case AppLifecycleState.paused:
        // AppLog.log('App--->进入后台');
-        BlueManage().disconnect();
+        BlueManage.instance.disconnect();
        break;
      case AppLifecycleState.resumed:
        // AppLog.log('App--->进入前台');
--- a/lib/blue/blue_manage.dart
+++ b/lib/blue/blue_manage.dart
@ -85,6 +85,12 @@ class BlueManage {
    return _manager;
  }

+  // 提供全局单例访问入口
+  static BlueManage get instance {
+    _manager ??= BlueManage._init();
+    return _manager!;
+  }
+
  BlueManage? get manager => shareManager();

  void _initBlue() {
@ -94,9 +100,13 @@ class BlueManage {
  }

  void _initGetMtuSubscription() {
-    _mtuSubscription ??= bluetoothConnectDevice!.mtu.listen((int value) {
+    // 先取消之前的订阅，避免重复监听
+    _mtuSubscription?.cancel();
+    _mtuSubscription = null;
+    
+    _mtuSubscription = bluetoothConnectDevice!.mtu.listen((int value) {
      _mtuSize = value - 3;
-      AppLog.log('_mtuSizeValue:$value mtuSize:$_mtuSize');
+      AppLog.log('设备MTU变化 - 原始值:$value 计算后MTU:$_mtuSize 设备:${bluetoothConnectDevice?.remoteId.str}');
    });
  }

@ -954,6 +964,12 @@ class BlueManage {
  Future<void> disconnect() async {
    try {
      connectDeviceMacAddress = '';
+      
+      // 清理MTU监听
+      _mtuSubscription?.cancel();
+      _mtuSubscription = null;
+      _mtuSize = 20; // 重置MTU为默认值
+      
      if (bluetoothConnectionState == BluetoothConnectionState.connected) {
        //加快蓝牙断连
        await bluetoothConnectDevice!.disconnect(timeout: 3);
@ -975,10 +991,29 @@ class BlueManage {
    }
  }

+  // 获取当前MTU信息，用于调试
+  String getMtuDebugInfo() {
+    return 'MTU Debug Info:\n'
+        '- Current MTU Size: $_mtuSize\n'
+        '- Connected Device: ${bluetoothConnectDevice?.remoteId.str ?? "None"}\n'
+        '- Device Name: $connectDeviceName\n'
+        '- Connection State: $bluetoothConnectionState\n'
+        '- MTU Subscription Active: ${_mtuSubscription != null}';
+  }
+
  void disposed() {
    _sendStreamSubscription?.cancel();
-    _mtuSubscription!.cancel();
-    _adapterStateStateSubscription!.cancel();
-    _connectionStateSubscription!.cancel();
+    _mtuSubscription?.cancel();
+    _adapterStateStateSubscription?.cancel();
+    _connectionStateSubscription?.cancel();
+    
+    // 重置状态
+    _mtuSize = 20;
+    connectDeviceName = '';
+    connectDeviceMacAddress = '';
+    bluetoothConnectDevice = null;
+    scanDevices.clear();
+    allData.clear();
+    lastTimeData.clear();
  }
 }
--- a/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart
+++ b/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart
@ -439,9 +439,24 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
  _handlerVoicePackageConfigureConfirmation(
    VoicePackageConfigureConfirmationReply reply,
  ) async {
-    final int status = reply.data[2];
-    switch (status) {
-      case 0x00:
+    showEasyLoading();
+    showBlueConnetctToastTimer(action: () {
+      dismissEasyLoading();
+    });
+    final LoginEntity entity = await ApiRepository.to.settingCurrentVoiceTimbre(
+      data: {
+        'lang': state.tempLangStr.value,
+        'timbre': state.tempTimbreStr.value,
+      },
+      lockId: state.lockSetInfoData.value.lockId!,
+    );
+    if (entity.errorCode!.codeIsSuccessful) {
+      showSuccess('设置成功'.tr, something: () async {
+        state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang =
+            state.tempLangStr.value;
+        state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre
+            ?.timbre = state.tempTimbreStr.value;
+
        await BlueManage().blueSendData(BlueManage().connectDeviceName,
            (BluetoothConnectionState deviceConnectionState) async {
          if (deviceConnectionState == BluetoothConnectionState.connected) {
@ -458,10 +473,8 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
            showBlueConnetctToast();
          }
        });
-        break;
-      default:
-        showToast('设置'.tr + '失败'.tr);
-        break;
+        await Future.delayed(Duration(seconds: 1));
+      });
    }
  }

@ -470,24 +483,6 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
    switch (status) {
      case 0x00:
        cancelBlueConnetctToastTimer();
-        final LoginEntity entity =
-            await ApiRepository.to.settingCurrentVoiceTimbre(
-          data: {
-            'lang': state.tempLangStr.value,
-            'timbre': state.tempTimbreStr.value,
-          },
-          lockId: state.lockSetInfoData.value.lockId!,
-        );
-        if (entity.errorCode!.codeIsSuccessful) {
-          showSuccess('设置成功'.tr, something: () {
-            state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre
-                ?.lang = state.tempLangStr.value;
-            state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre
-                ?.timbre = state.tempTimbreStr.value;
-            eventBus.fire(
-                PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-          });
-        }
        dismissEasyLoading();
        break;
      default:
@ -522,7 +517,6 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
        languageCode =
            languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)

-
        if (languageCode != null && languageCode != '') {
          final indexWhere = state.languages
              .indexWhere((element) => element.lang == languageCode);
--- a/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_page.dart
+++ b/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_page.dart
@ -64,7 +64,7 @@ class _SpeechLanguageSettingsPageState
                    return CommonItem(
                      leftTitel: soundType,
                      leftTitleStyle: TextStyle(
-                        fontSize: 22.sp,
+                        fontSize: 20.sp,
                        fontWeight: state.selectSoundTypeIndex.value == index
                            ? FontWeight.bold
                            : null,
@ -111,7 +111,7 @@ class _SpeechLanguageSettingsPageState
                      return CommonItem(
                        leftTitel: item.langText,
                        leftTitleStyle: TextStyle(
-                          fontSize: 22.sp,
+                          fontSize: 20.sp,
                          fontWeight: state.selectPassthroughListIndex.value == index
                              ? FontWeight.bold
                              : null,
--- a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart
+++ b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart
@ -84,22 +84,42 @@ class LockVoiceSettingLogic extends BaseGetXController {
    showBlueConnetctToastTimer(action: () {
      dismissEasyLoading();
    });
-    await BlueManage().blueSendData(BlueManage().connectDeviceName,
-        (BluetoothConnectionState deviceConnectionState) async {
-      if (deviceConnectionState == BluetoothConnectionState.connected) {
-        await BlueManage().writeCharacteristicWithResponse(
-          SetVoicePackageFinalResult(
-            lockID: BlueManage().connectDeviceName,
-            languageCode: state.tempLangStr.value,
-          ).packageData(),
-        );
-      } else if (deviceConnectionState ==
-          BluetoothConnectionState.disconnected) {
-        dismissEasyLoading();
-        cancelBlueConnetctToastTimer();
-        showBlueConnetctToast();
-      }
-    });
+    final LoginEntity entity = await ApiRepository.to.settingCurrentVoiceTimbre(
+      data: {
+        'lang': state.tempLangStr.value,
+        'timbre': state.tempTimbreStr.value,
+      },
+      lockId: state.lockSetInfoData.value.lockId!,
+    );
+    if (entity.errorCode!.codeIsSuccessful) {
+      showSuccess('设置成功'.tr, something: () async {
+        state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre?.lang =
+            state.tempLangStr.value;
+        state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre
+            ?.timbre = state.tempTimbreStr.value;
+
+        await BlueManage().blueSendData(BlueManage().connectDeviceName,
+            (BluetoothConnectionState deviceConnectionState) async {
+          if (deviceConnectionState == BluetoothConnectionState.connected) {
+            await BlueManage().writeCharacteristicWithResponse(
+              SetVoicePackageFinalResult(
+                lockID: BlueManage().connectDeviceName,
+                languageCode: state.tempLangStr.value,
+              ).packageData(),
+            );
+          } else if (deviceConnectionState ==
+              BluetoothConnectionState.disconnected) {
+            dismissEasyLoading();
+            cancelBlueConnetctToastTimer();
+            showBlueConnetctToast();
+          }
+        });
+        await Future.delayed(Duration(seconds: 1));
+        eventBus
+            .fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
+        Get.offAllNamed(Routers.starLockMain);
+      });
+    }
  }

  void handleSetResult(SetVoicePackageFinalResultReply reply) async {
@ -107,26 +127,6 @@ class LockVoiceSettingLogic extends BaseGetXController {
    switch (status) {
      case 0x00:
        cancelBlueConnetctToastTimer();
-        final LoginEntity entity =
-            await ApiRepository.to.settingCurrentVoiceTimbre(
-          data: {
-            'lang': state.tempLangStr.value,
-            'timbre': state.tempTimbreStr.value,
-          },
-          lockId: state.lockSetInfoData.value.lockId!,
-        );
-        if (entity.errorCode!.codeIsSuccessful) {
-          showSuccess('设置成功'.tr, something: () {
-            state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre
-                ?.lang = state.tempLangStr.value;
-            state.lockSetInfoData.value.lockSettingInfo?.currentVoiceTimbre
-                ?.timbre = state.tempTimbreStr.value;
-
-            eventBus.fire(
-                PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-            Get.offAllNamed(Routers.starLockMain);
-          });
-        }
        dismissEasyLoading();
        break;
      default:
@ -473,33 +473,25 @@ class LockVoiceSettingLogic extends BaseGetXController {
        //成功
        cancelBlueConnetctToastTimer();

-// 1. 计算 LanguageCode 在字节数组中的起始和结束索引
-//    CmdID (2 bytes) + Status (1 byte) = 3 bytes -> LanguageCode 从索引 3 开始
        const int languageCodeStartIndex = 3;
        const int languageCodeLength = 20;
        const int languageCodeEndIndex =
            languageCodeStartIndex + languageCodeLength; // 23

-// 2. 检查数据长度是否足够
        if (reply.data.length < languageCodeEndIndex) {
          throw Exception(
              'Reply data is too short to contain LanguageCode. Expected at least $languageCodeEndIndex bytes, got ${reply.data.length}');
        }
-// 3. 从字节数组中截取 LanguageCode 对应的字节段
+
        List<int> languageCodeBytes =
            reply.data.sublist(languageCodeStartIndex, languageCodeEndIndex);

-// 4. 将字节列表转换为字符串
-//    通常这种编码是 UTF-8 或 ASCII
        String languageCode = String.fromCharCodes(languageCodeBytes);

-// 5. (可选) 清理字符串：移除可能的填充字符（如空字符 '\0' 或空格）
-//    因为字段长度固定为20，不足的部分可能用 '\0' 填充
        languageCode = languageCode.trim(); // 移除首尾空格
        languageCode =
            languageCode.replaceAll('\u0000', ''); // 移除空字符 (null bytes)

-// 6. 使用提取到的 languageCode
        print('LanguageCode: $languageCode'); // 例如: zh_CN, en_US

        if (languageCode != null && languageCode != '') {
--- a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart
+++ b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart
@ -96,7 +96,7 @@ class _LockVoiceSettingState extends State<LockVoiceSetting> {
                      return CommonItem(
                        leftTitel: soundType,
                        leftTitleStyle: TextStyle(
-                          fontSize: 22.sp,
+                          fontSize: 20.sp,
                          fontWeight: state.selectSoundTypeIndex.value == index
                              ? FontWeight.bold
                              : null,
@ -142,7 +142,7 @@ class _LockVoiceSettingState extends State<LockVoiceSetting> {
                      return CommonItem(
                        leftTitel: item.langText,
                        leftTitleStyle: TextStyle(
-                          fontSize: 22.sp,
+                          fontSize: 20.sp,
                          fontWeight:
                              state.selectPassthroughListIndex.value == index
                                  ? FontWeight.bold
@ -152,7 +152,7 @@ class _LockVoiceSettingState extends State<LockVoiceSetting> {
                        isHaveLine: true,
                        isHaveDirection: false,
                        isHaveRightWidget: true,
-                        leftTitleMaxWidth: 0.9.sw,
+                        leftTitleMaxWidth: 0.85.sw,
                        rightWidget:
                            state.selectPassthroughListIndex.value == index
                                ? Image(