liwei1dao
/
deepvoice_client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'new_dev' of https://github.com/deepcloud2048/deep_voice into new_dev

newdev_shunjiawei
liwei1dao 1 year ago
parent
8022e5d368 dd76437fb5
commit
14a482e69f
5 changed files with 93 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lib/core/translations/language/en_us.dart
  2. 2
      lib/core/translations/language/zh_cn.dart
  3. 2
      lib/data/services/novice_guide_service.dart
  4. 132
      lib/modules/profile/views/profile_view.dart
  5. 44
      lib/modules/settings/views/settings_view.dart

2
lib/core/translations/language/en_us.dart
View File

@ -436,6 +436,8 @@ const Map<String, String> enUS = {
'deleteAccount': 'Delete Account', 'deleteAccount': 'Delete Account',
'deleteAccountTips': 'deleteAccountTips':
'Are you sure you want to permanently delete your account? This action cannot be undone.', 'Are you sure you want to permanently delete your account? This action cannot be undone.',
'clean': 'Clear Cache', // 清除缓存
'cleanTips': 'Are you sure you want to clear personal cache?', // 确定要清除个人缓存吗？
//Profile 错误信息 //Profile 错误信息
'networkConnectionFailed': 'networkConnectionFailed':

2
lib/core/translations/language/zh_cn.dart
View File

@ -411,6 +411,8 @@ const Map<String, String> zhCN = {
"logoutTips": "确定要退出当前账号吗？", "logoutTips": "确定要退出当前账号吗？",
'deleteAccount': '注销账号', 'deleteAccount': '注销账号',
'deleteAccountTips': '确定要永久删除您的账号吗？此操作不可撤销', 'deleteAccountTips': '确定要永久删除您的账号吗？此操作不可撤销',
'clean': '清除缓存',
'cleanTips': '确定要清除个人缓存吗？',
// Profile 错误信息 // Profile 错误信息
'networkConnectionFailed': '网络连接失败，请检查网络设置后重试', 'networkConnectionFailed': '网络连接失败，请检查网络设置后重试',

2
lib/data/services/novice_guide_service.dart
View File

@ -11,7 +11,7 @@ class NoviceGuideService extends GetxService {
final BleService _bleService = BleService(); final BleService _bleService = BleService();
StreamSubscription<dynamic>? _statusSubscription; StreamSubscription<dynamic>? _statusSubscription;
bool isHomeGuide = false; bool isHomeGuide = true;
bool isAIGuide = true; bool isAIGuide = true;
RxBool isWakeup = false.obs; RxBool isWakeup = false.obs;

132
lib/modules/profile/views/profile_view.dart
View File

@ -740,72 +740,72 @@ class EditProfileView extends GetView<ProfileController> {
}, },
isDarkMode: isDarkMode, isDarkMode: isDarkMode,
), ),
// Divider( Divider(
// height: 1, height: 1,
// color: isDarkMode color: isDarkMode
// ? Colors.white.withOpacity(0.1) ? Colors.white.withOpacity(0.1)
// : Colors.grey[200]), : Colors.grey[200]),
// // 清理缓存 // 清理缓存
// _buildSimpleNavigationSetting( _buildSimpleNavigationSetting(
// title: 'clean'.tr, // 清理缓存 title: 'clean'.tr, // 清理缓存
// icon: Icons.logout, icon: Icons.cleaning_services,
// iconBgColor: isDarkMode iconBgColor: isDarkMode
// ? Colors.red[900]!.withOpacity(0.3) ? Colors.red[900]!.withOpacity(0.3)
// : Colors.red[50]!, : Colors.red[50]!,
// iconColor: isDarkMode ? Colors.red[300]! : Colors.red[600]!, iconColor: isDarkMode ? Colors.red[300]! : Colors.red[600]!,
// titleColor: titleColor:
// isDarkMode ? Colors.red[300]! : Colors.red[600]!, isDarkMode ? Colors.red[300]! : Colors.red[600]!,
// onTap: () { onTap: () {
// // 退出登录确认对话框 // 退出登录确认对话框
// Get.dialog( Get.dialog(
// AlertDialog( AlertDialog(
// backgroundColor: backgroundColor:
// isDarkMode ? Colors.grey[900] : Colors.white, isDarkMode ? Colors.grey[900] : Colors.white,
// title: Text( title: Text(
// 'clean'.tr, // 清理缓存 'clean'.tr, // 清除缓存
// style: TextStyle( style: TextStyle(
// color: isDarkMode ? Colors.white : Colors.black87, color: isDarkMode ? Colors.white : Colors.black87,
// ), ),
// ), ),
// content: Text( content: Text(
// 'cleanTips'.tr, // 确定要退出当前账号吗？ 'cleanTips'.tr, // 确定要清除个人缓存吗？
// style: TextStyle( style: TextStyle(
// color: color:
// isDarkMode ? Colors.white70 : Colors.black54, isDarkMode ? Colors.white70 : Colors.black54,
// ), ),
// ), ),
// actions: [ actions: [
// TextButton( TextButton(
// onPressed: () => Get.back(), onPressed: () => Get.back(),
// child: Text( child: Text(
// 'cancel'.tr, // 取消 'cancel'.tr, // 取消
// style: TextStyle( style: TextStyle(
// color: isDarkMode color: isDarkMode
// ? Colors.white70 ? Colors.white70
// : Colors.black54, : Colors.black54,
// ), ),
// ), ),
// ), ),
// TextButton( TextButton(
// onPressed: () { onPressed: () {
// Get.back(); Get.back();
// controller.clean(); controller.clean();
// }, },
// child: Text( child: Text(
// 'confirm'.tr, // 确定 'confirm'.tr, // 确定
// style: TextStyle( style: TextStyle(
// color: isDarkMode color: isDarkMode
// ? Colors.red[300] ? Colors.red[300]
// : Colors.red[600], : Colors.red[600],
// ), ),
// ), ),
// ), ),
// ], ],
// ), ),
// ); );
// }, },
// isDarkMode: isDarkMode, isDarkMode: isDarkMode,
// ), ),
Divider( Divider(
height: 1, height: 1,
color: isDarkMode color: isDarkMode

44
lib/modules/settings/views/settings_view.dart
View File

@ -419,29 +419,29 @@ class SettingsView extends GetView<SettingsController> {
isDarkMode: isDarkMode, isDarkMode: isDarkMode,
), ),
// if (Platform.isAndroid) ...[ // if (Platform.isAndroid) ...[
Divider( // Divider(
height: 1, // height: 1,
color: isDarkMode // color: isDarkMode
? Colors.white.withOpacity(0.1) // ? Colors.white.withOpacity(0.1)
: Colors.grey[200]), // : Colors.grey[200]),
// 隐私设置 // // 隐私设置
_buildSimpleNavigationSetting( // _buildSimpleNavigationSetting(
title: 'privacySettings'.tr, // 隐私设置 // title: 'privacySettings'.tr, // 隐私设置
subtitle: 'privacySettingsInfo'.tr, // 管理数据收集和权限 // subtitle: 'privacySettingsInfo'.tr, // 管理数据收集和权限
icon: Icons.shield_outlined, // icon: Icons.shield_outlined,
iconBgColor: isDarkMode // iconBgColor: isDarkMode
? Colors.purple[900]!.withOpacity(0.3) // ? Colors.purple[900]!.withOpacity(0.3)
: Colors.purple[100]!, // : Colors.purple[100]!,
iconColor: // iconColor:
isDarkMode ? Colors.purple[300]! : Colors.purple[600]!, // isDarkMode ? Colors.purple[300]! : Colors.purple[600]!,
titleColor: isDarkMode ? Colors.white : null, // titleColor: isDarkMode ? Colors.white : null,
subtitleColor: isDarkMode ? Colors.white70 : null, // subtitleColor: isDarkMode ? Colors.white70 : null,
onTap: () { // onTap: () {
AppSettings.openAppSettings(); // AppSettings.openAppSettings();
}, // },
isDarkMode: isDarkMode, // isDarkMode: isDarkMode,
), // ),
// ], // ],
Divider( Divider(

Write Preview
Loading…
Cancel
Save