Browse Source

Merge commit '00e30515419ec26d889d39c46026e2b08f895b7e'

weicu
lxm 2 years ago
parent
commit
aa1f08dbd8
  1. 4
      lib/modules/pairing/controllers/pairing_controller.dart
  2. 46
      lib/modules/settings/views/settings_view.dart

4
lib/modules/pairing/controllers/pairing_controller.dart

@ -103,7 +103,7 @@ class PairingController extends GetxController {
return; return;
} }
statusDescription.value = '未找到已连接的蓝牙设备'; statusDescription.value = 'notFound'.tr;//未找到已连接的蓝牙设备
} }
/// 初始化流程 /// 初始化流程
@ -113,7 +113,7 @@ class PairingController extends GetxController {
_voiceInteractionService.initialize(); _voiceInteractionService.initialize();
isLoading.value = true; isLoading.value = true;
statusDescription.value = '正在初始化...'; statusDescription.value = 'initializing'.tr; // 正在初始化...;
// 确保蓝牙服务已初始化 // 确保蓝牙服务已初始化
if (!await _bluetoothService.initialize()) { if (!await _bluetoothService.initialize()) {

46
lib/modules/settings/views/settings_view.dart

@ -435,29 +435,29 @@ class SettingsView extends GetView<SettingsController> {
: Colors.grey[200]), : Colors.grey[200]),
// 备份与恢复 // 备份与恢复
_buildNavigationSetting( // _buildNavigationSetting(
title: 'backups'.tr, // 备份与恢复 // title: 'backups'.tr, // 备份与恢复
subtitle: 'backupsInfo'.tr, // 备份设置和AI互动历史 // subtitle: 'backupsInfo'.tr, // 备份设置和AI互动历史
icon: Icons.cloud_upload_outlined, // icon: Icons.cloud_upload_outlined,
iconBgColor: isDarkMode // iconBgColor: isDarkMode
? Colors.cyan[900]!.withOpacity(0.3) // ? Colors.cyan[900]!.withOpacity(0.3)
: Colors.cyan[100]!, // : Colors.cyan[100]!,
iconColor: // iconColor:
isDarkMode ? Colors.cyan[300]! : Colors.cyan[600]!, // isDarkMode ? Colors.cyan[300]! : Colors.cyan[600]!,
value: '${'lastBackup'.tr} 今天', // 上次备份: // value: '${'lastBackup'.tr} 今天', // 上次备份:
valueStyle: TextStyle( // valueStyle: TextStyle(
fontSize: 12.sp, // fontSize: 12.sp,
color: isDarkMode ? Colors.white70 : Colors.grey[500], // color: isDarkMode ? Colors.white70 : Colors.grey[500],
), // ),
onTap: () { // onTap: () {
// 打开备份设置页面 // // 打开备份设置页面
print( // print(
'---------用户头像-${controller.userInfo.value.avatar}'); // '---------用户头像-${controller.userInfo.value.avatar}');
print('---------用户名-${controller.userInfo.value.name}'); // print('---------用户名-${controller.userInfo.value.name}');
//print('user${User.instance.value}'); // //print('user${User.instance.value}');
}, // },
isDarkMode: isDarkMode, // isDarkMode: isDarkMode,
), // ),
Divider( Divider(
height: 1, height: 1,
color: isDarkMode color: isDarkMode

Loading…
Cancel
Save