From 477f4f21be8aa62eccc7d524637df7f16f1804c2 Mon Sep 17 00:00:00 2001 From: liyi Date: Mon, 18 Aug 2025 09:19:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=8D=8F=E8=AE=AE=E7=9A=84=E9=80=89=E9=A1=B9=E3=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E7=9A=84=E8=8B=B1=E6=96=87=E5=90=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../speech_language_settings_logic.dart | 2 +- .../speech_language_settings_page.dart | 61 +------------------ .../third_party_platform_state.dart | 1 + .../lock_voice_setting_logic.dart | 4 +- .../lock_voice_setting_page.dart | 1 + .../mineMultiLanguage_page.dart | 1 + lib/translations/app_dept.dart | 4 +- 7 files changed, 9 insertions(+), 65 deletions(-) diff --git a/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart b/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart index 4422954f..d98e1992 100644 --- a/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart +++ b/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart @@ -93,7 +93,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController { final passthroughItem = PassthroughItem( lang: element.lang, timbres: element.timbres, - langText: '简体中文'.tr + '（中国台湾）'.tr, + langText: '简体中文'.tr + '（中国台湾）'.tr+'（Simplified Chinese TW）', name: element.name, ); state.languages.add(passthroughItem); diff --git a/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_page.dart b/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_page.dart index ef590be8..d368546c 100644 --- a/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_page.dart +++ b/lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_page.dart @@ -107,6 +107,7 @@ class _SpeechLanguageSettingsPageState isHaveLine: true, isHaveDirection: false, isHaveRightWidget: true, + leftTitleMaxWidth: 0.9.sw, // 设置左侧标题最大宽度 rightWidget: state.selectPassthroughListIndex.value == index ? Image( @@ -131,66 +132,6 @@ class _SpeechLanguageSettingsPageState ); } - Widget _buildBody() { - return Obx( - () => SingleChildScrollView( - child: Column( - children: [ - ListView.builder( - itemCount: state.soundTypeList.length, - itemBuilder: (BuildContext context, int index) { - // 判断是否是最后一个元素（索引等于 itemCount - 1） - final isLastItem = index == state.soundTypeList.length - 1; - - // 获取当前平台数据（假设 platFormSet 是 RxList） - final platform = state.soundTypeList.value[index]; - return CommonItem( - leftTitel: state.soundTypeList.value[index], - rightTitle: '', - isHaveLine: !isLastItem, - // 最后一个元素不显示分割线（取反） - isHaveDirection: false, - isHaveRightWidget: true, - rightWidget: Radio( - // Radio 的值：使用平台的唯一标识（如 id） - value: platform, - // 当前选中的值：与 selectPlatFormIndex 关联的 id - groupValue: state.soundTypeList - .value[state.selectSoundTypeIndex.value], - // 选中颜色（可选，默认主题色） - activeColor: AppColors.mainColor, - // 点击 Radio 时回调（更新选中索引） - onChanged: (value) { - if (value != null) { - setState(() { - // 找到当前选中平台的索引（根据 id 匹配） - final newIndex = state.soundTypeList.value - .indexWhere((p) => p == value); - if (newIndex != -1) { - state.selectSoundTypeIndex.value = newIndex; - } - }); - } - }, - ), - action: () { - setState(() { - state.selectSoundTypeIndex.value = index; - }); - }, - ); - }, - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics() //add this line, - ), - Column( - children: _buildList(), - ), - ], - ), - ), - ); - } List _buildList() { final appLocalLanguages = state.languages; diff --git a/lib/main/lockDetail/lockSet/thirdPartyPlatform/third_party_platform_state.dart b/lib/main/lockDetail/lockSet/thirdPartyPlatform/third_party_platform_state.dart index 325b8ba1..184bf445 100644 --- a/lib/main/lockDetail/lockSet/thirdPartyPlatform/third_party_platform_state.dart +++ b/lib/main/lockDetail/lockSet/thirdPartyPlatform/third_party_platform_state.dart @@ -16,6 +16,7 @@ class ThirdPartyPlatformState { final RxList platFormSet = List.of({ '锁通通'.tr, '涂鸦智能'.tr, + 'Matter'.tr , }).obs; RxInt selectPlatFormIndex = 0.obs; diff --git a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart index 17019e57..986c7fb6 100644 --- a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart +++ b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_logic.dart @@ -250,11 +250,10 @@ class LockVoiceSettingLogic extends BaseGetXController { if (lang == 'zh_TW') { // 如果是台湾的话应该显示未简体中文 List parts = lang.split('_'); - final indexOf = locales.indexOf(Locale(parts[0], parts[1])); final passthroughItem = PassthroughItem( lang: element.lang, timbres: element.timbres, - langText: '简体中文'.tr + '（中国台湾）'.tr, + langText: '简体中文'.tr + '（中国台湾）'.tr + '（Simplified Chinese TW）', name: element.name, ); state.languages.add(passthroughItem); @@ -268,6 +267,7 @@ class LockVoiceSettingLogic extends BaseGetXController { ExtensionLanguageType.fromLocale(locales[indexOf]).lanTitle, name: element.name, ); + state.languages.add(passthroughItem); } }); diff --git a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart index ed5e0ec5..eb551980 100644 --- a/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart +++ b/lib/mine/addLock/lock_voice_setting/lock_voice_setting_page.dart @@ -139,6 +139,7 @@ class _LockVoiceSettingState extends State { isHaveLine: true, isHaveDirection: false, isHaveRightWidget: true, + leftTitleMaxWidth: 0.9.sw, rightWidget: state.selectPassthroughListIndex.value == index ? Image( diff --git a/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart b/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart index 1e003033..63fd9d4f 100755 --- a/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart +++ b/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart @@ -104,6 +104,7 @@ class _MineMultiLanguagePageState extends State { isHaveLine: true, isHaveDirection: false, isHaveRightWidget: true, + leftTitleMaxWidth: 0.9.sw, // 设置左侧标题最大宽度 rightWidget: state.currentLanguageType.value == lanType ? Image( image: const AssetImage('images/icon_item_checked.png'), diff --git a/lib/translations/app_dept.dart b/lib/translations/app_dept.dart index 715a3b14..289365e0 100755 --- a/lib/translations/app_dept.dart +++ b/lib/translations/app_dept.dart @@ -212,10 +212,10 @@ extension ExtensionLanguageType on LanguageType { str = '简体中文'.tr + '（Simplified Chinese）'; break; case LanguageType.traditionalChineseTW: - str = '繁体中文(中国台湾)'.tr + '（Traditional Chinese, Taiwan）'; + str = '繁体中文(中国台湾)'.tr + '（Traditional Chinese TW）'; break; case LanguageType.traditionalChineseHK: - str = '繁体中文(中国香港)'.tr + '（Traditional Chinese, Hong Kong）'; + str = '繁体中文(中国香港)'.tr + '（Traditional Chinese HK）'; break; case LanguageType.french: str = '法语'.tr + '（French）';