Merge branch 'main' of https://git.onewaygame.cn/deepsound/deepvoice_client into tanls

lib/core/translations/language/de_de.dart

@@ -180,6 +180,8 @@ const Map<String, String> deDE = {
   'selecttimbre': 'Klangfarbe Wählen',
   'pleaseRead': 'Bitte lesen',
   'completeRecording': 'Aufnahme abschließen',
+  'deleteAccount': 'Konto löschen',
+  'deleteAccountTips': 'Möchten Sie Ihr Konto wirklich dauerhaft löschen? Diese Aktion kann nicht rückgängig gemacht werden.',
 
   
   // 聊天页

lib/core/translations/language/en_us.dart

@@ -185,6 +185,8 @@ const Map<String, String> enUS = {
   'selecttimbre': 'Select Timbre',
   'pleaseRead': 'Please Read',
   'completeRecording': 'Complete Recording',
+  'deleteAccount': 'Delete Account',
+  'deleteAccountTips': 'Are you sure you want to permanently delete your account? This action cannot be undone.',
 
   
   // 聊天页

lib/core/translations/language/es_es.dart

@@ -180,7 +180,9 @@ const Map<String, String> esES = {
   'selecttimbre': 'Seleccionar Timbre',
   'pleaseRead': 'Por favor lea',
   'completeRecording': 'Completar grabación',
-
+  'deleteAccount': 'Eliminar cuenta',
+  'deleteAccountTips': '¿Está seguro de que desea eliminar permanentemente su cuenta? Esta acción no se puede deshacer.',
+  
   
   // 聊天页
   "clearChatHistory": "Borrar Historial de Chat",

lib/core/translations/language/fr_fr.dart

@@ -180,7 +180,9 @@ const Map<String, String> frFR = {
   'selecttimbre': 'Sélectionner le Timbre',
   'pleaseRead': 'Veuillez lire',
   'completeRecording': 'Terminer l\'enregistrement',
-
+  'deleteAccount': 'Supprimer le compte',
+  'deleteAccountTips': 'Êtes-vous sûr de vouloir supprimer définitivement votre compte ? Cette action ne peut pas être annulée.',
+  
   
   // 聊天页
   "clearChatHistory": "Effacer l'historique de chat",

lib/core/translations/language/it_it.dart

@@ -188,6 +188,9 @@ const Map<String, String> itIT = {
   'selecttimbre': 'Seleziona timbro vocale',
   'pleaseRead': 'Per favore leggi',
   'completeRecording': 'Completa registrazione',
+  'deleteAccount': 'Elimina account',
+  'deleteAccountTips': 'Sei sicuro di voler eliminare definitivamente il tuo account? Questa azione non può essere annullata.',
+  
 
   // 聊天页
   "clearChatHistory": "Cancella cronologia chat",

lib/core/translations/language/ja_jp.dart

@@ -180,6 +180,9 @@ const Map<String, String> jaJP = {
   'selecttimbre': '音色を選択',
   'pleaseRead': '読んでください',
   'completeRecording': '録音完了',
+  'deleteAccount': 'アカウントを削除',
+  'deleteAccountTips': 'アカウントを完全に削除してもよろしいですか？この操作は取り消すことができません。',
+  
   
   // 聊天页
   "clearChatHistory": "チャット履歴をクリア",

lib/core/translations/language/ko_kr.dart

@@ -180,6 +180,8 @@ const Map<String, String> koKR = {
   'selecttimbre': '음색 선택',
   'pleaseRead': '읽어주세요',
   'completeRecording': '녹음 완료',
+  'deleteAccount': '계정 삭제',
+  'deleteAccountTips': '계정을 영구적으로 삭제하시겠습니까? 이 작업은 취소할 수 없습니다.',
 
   
   // 聊天页

lib/core/translations/language/pt_pt.dart

@@ -180,7 +180,9 @@ const Map<String, String> ptPT = {
   'selecttimbre': 'Selecionar timbre',
   'pleaseRead': 'Por favor leia',
   'completeRecording': 'Concluir gravação',
-
+  'deleteAccount': 'Excluir conta',
+  'deleteAccountTips': 'Tem certeza de que deseja excluir permanentemente sua conta? Esta ação não pode ser desfeita.',
+  
   
   // 聊天页
   "clearChatHistory": "Limpar Histórico de Chat",

lib/core/translations/language/ru_ru.dart

@@ -180,7 +180,9 @@ const Map<String, String> ruRU = {
   'selecttimbre': 'Выбрать тембр',
   'pleaseRead': 'Пожалуйста, прочтите',
   'completeRecording': 'Завершить запись',
-
+  'deleteAccount': 'Удалить аккаунт',
+  'deleteAccountTips': 'Вы уверены, что хотите навсегда удалить свой аккаунт? Это действие нельзя отменить.',
+  
   
   // 聊天页
   "clearChatHistory": "Очистить историю чата",

lib/core/translations/language/vi_vn.dart

@@ -180,7 +180,8 @@ const Map<String, String> viVN = {
   'selecttimbre': 'Seleziona timbro vocale',
   'pleaseRead': 'Vui lòng đọc',
   'completeRecording': 'Hoàn thành ghi âm',
-
+  'deleteAccount': 'Xóa tài khoản',
+  'deleteAccountTips': 'Bạn có chắc chắn muốn xóa vĩnh viễn tài khoản của mình không? Hành động này không thể hoàn tác.',
 
   // 聊天页
   "clearChatHistory": "Xóa lịch sử trò chuyện",

lib/core/translations/language/zh_cn.dart

@@ -180,7 +180,10 @@ const Map<String, String> zhCN = {
   'selecttimbre': '选择音色',
   'pleaseRead': '请朗读',
   'completeRecording': '完成录制',
+  'deleteAccount': '注销账号',
+  'deleteAccountTips': '确定要永久删除您的账号吗？此操作不可撤销',
 
+  
   // 聊天页
   "clearChatHistory": "清空聊天记录",
   "online": "在线",

lib/core/translations/language/zh_hk.dart

@@ -180,7 +180,9 @@ const Map<String, String> zhHK = {
   'selecttimbre': '選擇音色',
   'pleaseRead': '請朗讀',
   'completeRecording': '完成錄製',
-
+  'deleteAccount': '註銷賬號',
+  'deleteAccountTips': '確定要永久刪除您的賬號嗎？此操作不可撤銷',
+  
 
   // 聊天页
   "clearChatHistory": "清空聊天記錄",

lib/data/services/network/api.dart

@@ -46,4 +46,13 @@ class Api {
       params: params,
     );
   }
+
+  //注销账号
+  static deleteUser([params]) {
+    return DioManager().request(
+      NWMethod.post,
+      '/api/home/user_del',
+      params: params,
+    );
+  }
 }

lib/main.dart

@@ -67,6 +67,7 @@ class MainApp extends StatelessWidget {
       builder: (_, child) {
         return GetMaterialApp(
           title: 'DeepSound',
+          defaultTransition: Transition.noTransition, // 设置默认过渡动画为无动画
           theme: AppTheme.lightTheme,
           darkTheme: AppTheme.darkTheme,
           themeMode: themeMode, // 使用提前获取的主题模式

lib/modules/profile/controllers/profile_controller.dart

@@ -195,47 +195,29 @@ class ProfileController extends GetxController {
         }
       }
 
-      final dio = Dio(BaseOptions(
-        baseUrl: 'https://www.deapsound.com:443',
-        headers: {
-          'accept': 'application/json',
-          'Authorization': _storage.read<String>("logintoken"),
-          'Content-Type': 'application/json',
-        },
-      ));
-
-      // 调用API前打印token
-      Logger().d('当前用户token: ${_storage.read<String>("logintoken")}');
-      Logger().d('请求数据: ${{"user": data}}');
-      final response = await dio.post(
-        '/api/home/user_setting',
-        data: data,
-      );
-
 
+      Logger().d('准备更新用户信息: $data');
       // 调用API
-      //final response = await Api.updateUserSetting(data);
+      final response = await Api.updateUserSetting(data);
-
+      Logger().d('--更新用户信息响应: $response');
-      if (response.statusCode == 200) {
+      if(response != null){
-        if (response.data['code'] == 0) {
+        Logger().d('更新成功: $response');
-          Logger().d('更新成功: ${response.data}');
+        Get.snackbar('成功', '同步到服务器成功');
-          Get.snackbar('成功', '同步到服务器成功');
+        userInfo.update((u) {
-          userInfo.update((u) {
+          if (u!= null) {
-            if (u != null) {
+            u.name = response['name']?? '';
-              u.name = response.data['data']['name'] ?? '';
+            u.avatar = response['avatar']?? '';
-              u.avatar = response.data['data']['avatar'] ?? '';
+          }
-            }
+        }); 
-          });
+        Logger().d('更新后的用户信息: ${userInfo.value.toJson()}');
-          Logger().d('更新后的用户信息: ${userInfo.value.toJson()}');
+      }else{
-        } else {
+        Logger().e('更新失败: $response');
-          throw '更新失败：${response.data['msg'] ?? '未知错误'}';
+        Get.snackbar('错误', '同步到服务器失败，请重试');
-        }
+        return;
-      } else {
-        throw '服务器响应错误: ${response.statusCode}';
       }
     } catch (e) {
       Logger().e('同步到后端失败: $e');
-      Get.snackbar('错误', '同步到服务器失败，请重试');
+      Get.snackbar('Error', '同步到服务器失败，请重试');
       throw e;
     }
   }

lib/modules/settings/controllers/settings_controller.dart

@@ -14,26 +14,32 @@ import 'package:path_provider/path_provider.dart';
 import 'dart:io';
 import '../../../routes/app_routes.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import '../../../data/services/network/api.dart';
 
 class SettingsController extends GetxController {
   // 语言设置
   final List<LanguageModel> languageList = [
     LanguageModel(
         name: 'followingSystem', // 跟随系统.tr
-        alias: '', 
+        alias: '',
         value: 'system'),
     LanguageModel(name: 'english', alias: 'English', value: 'en_US'), // 英语.tr
     LanguageModel(name: 'chinese', alias: '中文', value: 'zh_CN'), // 中文.tr
-    LanguageModel(name: 'traditionalChinese', alias: '繁體中文', value: 'zh_HK'),  // 添加繁体中文
+    LanguageModel(
-    LanguageModel(name: 'spanish', alias: 'Español', value: 'es_ES'),  // 添加西班牙语选项
+        name: 'traditionalChinese', alias: '繁體中文', value: 'zh_HK'), // 添加繁体中文
-    LanguageModel(name: 'portuguese', alias: 'Português', value: 'pt_PT'),  // 添加葡萄牙语
+    LanguageModel(
-    LanguageModel(name: 'japanese', alias: '日本語', value: 'ja_JP'),  // 添加日语选项
+        name: 'spanish', alias: 'Español', value: 'es_ES'), // 添加西班牙语选项
-    LanguageModel(name: 'korean', alias: '한국어', value: 'ko_KR'),  // 添加韩语选项
+    LanguageModel(
-    LanguageModel(name: 'french', alias: 'Français', value: 'fr_FR'),  // 添加法语选项
+        name: 'portuguese', alias: 'Português', value: 'pt_PT'), // 添加葡萄牙语
-    LanguageModel(name: 'german', alias: 'Deutsch', value: 'de_DE'),  // 添加德语选项
+    LanguageModel(name: 'japanese', alias: '日本語', value: 'ja_JP'), // 添加日语选项
-    LanguageModel(name: 'russian', alias: 'Русский', value: 'ru_RU'),  // 添加俄语选项
+    LanguageModel(name: 'korean', alias: '한국어', value: 'ko_KR'), // 添加韩语选项
-    LanguageModel(name: 'vietnamese', alias: 'Tiếng Việt', value: 'vi_VN'),  // 添加越南语选项
+    LanguageModel(name: 'french', alias: 'Français', value: 'fr_FR'), // 添加法语选项
-    LanguageModel(name: 'italian', alias: 'Italiano', value: 'it_IT'),  // 添加意大利语选项
+    LanguageModel(name: 'german', alias: 'Deutsch', value: 'de_DE'), // 添加德语选项
+    LanguageModel(name: 'russian', alias: 'Русский', value: 'ru_RU'), // 添加俄语选项
+    LanguageModel(
+        name: 'vietnamese', alias: 'Tiếng Việt', value: 'vi_VN'), // 添加越南语选项
+    LanguageModel(
+        name: 'italian', alias: 'Italiano', value: 'it_IT'), // 添加意大利语选项
   ];
 
   Rx<LanguageModel> language = LanguageModel().obs;
@@ -129,11 +135,11 @@ class SettingsController extends GetxController {
   void loadUserInfo() {
     final userJson = _storage.read(userKey);
     Logger().d('加载用户信息: $userJson');
-    
+
     if (userJson != null) {
       userInfo.value = User.instance;
       Logger().d('用户信息已加载: ${userInfo.value.toJson()}');
-      
+
       if (userInfo.value.avatar.isNotEmpty) {
         Logger().d('开始下载头像');
         _downloadAndSaveAvatar(userInfo.value.avatar);
@@ -150,10 +156,10 @@ class SettingsController extends GetxController {
   }
 
   // 下载并保存远程头像
-    Future<void> _downloadAndSaveAvatar(String url) async {
+  Future<void> _downloadAndSaveAvatar(String url) async {
     try {
       Logger().d('开始下载头像: $url');
-      
+
       final dio = Dio(BaseOptions(
         headers: {
           'accept': '*/*',
@@ -165,9 +171,9 @@ class SettingsController extends GetxController {
         url,
         options: Options(responseType: ResponseType.bytes),
       );
-      
+
       Logger().d('下载状态: ${response.statusCode}');
-      
+
       if (response.statusCode == 200) {
         // 保存到应用文档目录
         final appDir = await getApplicationDocumentsDirectory();
@@ -356,4 +362,34 @@ class SettingsController extends GetxController {
       print('退出登录错误: $e');
     }
   }
+
+  // 注销账号
+  Future<void> deleteAccount() async {
+    try {
+      // 显示加载提示
+      Get.dialog(
+        const Center(child: CircularProgressIndicator()),
+        barrierDismissible: false,
+      );
+
+      // 删除后台用户数据
+      final responce = await Api.deleteUser();
+      if (responce == null) {
+        Get.back(); // 关闭加载提示
+        Get.snackbar('错误', '删除用户数据失败');
+        return;
+      }
+      // 关闭加载提示
+      Get.back();
+
+      signOut(); // 调用 signOut 方法
+
+      Get.snackbar('Success', 'Account has been permanently deleted');
+      Logger().d('账号删除成功');
+    } catch (e) {
+      Get.back(); // 关闭加载提示
+      Get.snackbar('错误', '删除账号失败，请重试');
+      Logger().d('账号删除失败: $e');
+    }
+  }
 }

lib/modules/settings/views/settings_view.dart

@@ -548,6 +548,73 @@ class SettingsView extends GetView<SettingsController> {
                     },
                     isDarkMode: isDarkMode,
                   ),
+                  Divider(
+                      height: 1,
+                      color: isDarkMode
+                          ? Colors.white.withOpacity(0.1)
+                          : Colors.grey[200]),
+
+                  // 注销账号
+                  _buildSimpleNavigationSetting(
+                    title: 'deleteAccount'.tr, // 注销账号
+                    icon: Icons.delete_forever,
+                    iconBgColor: isDarkMode
+                        ? Colors.red[900]!.withOpacity(0.3)
+                        : Colors.red[50]!,
+                    iconColor: isDarkMode ? Colors.red[300]! : Colors.red[600]!,
+                    titleColor:
+                        isDarkMode ? Colors.red[300]! : Colors.red[600]!,
+                    onTap: () {
+                      // 注销账号确认对话框
+                      Get.dialog(
+                        AlertDialog(
+                          backgroundColor:
+                              isDarkMode ? Colors.grey[900] : Colors.white,
+                          title: Text(
+                            'deleteAccount'.tr, // 注销账号
+                            style: TextStyle(
+                              color: isDarkMode ? Colors.white : Colors.black87,
+                            ),
+                          ),
+                          content: Text(
+                            'deleteAccountTips'.tr, // 确定要永久删除您的账号吗？此操作不可撤销
+                            style: TextStyle(
+                              color:
+                                  isDarkMode ? Colors.white70 : Colors.black54,
+                            ),
+                          ),
+                          actions: [
+                            TextButton(
+                              onPressed: () => Get.back(),
+                              child: Text(
+                                'cancel'.tr, // 取消
+                                style: TextStyle(
+                                  color: isDarkMode
+                                      ? Colors.white70
+                                      : Colors.black54,
+                                ),
+                              ),
+                            ),
+                            TextButton(
+                              onPressed: () {
+                                Get.back();
+                                controller.deleteAccount();
+                              },
+                              child: Text(
+                                'confirm'.tr, // 确定
+                                style: TextStyle(
+                                  color: isDarkMode
+                                      ? Colors.red[300]
+                                      : Colors.red[600],
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      );
+                    },
+                    isDarkMode: isDarkMode,
+                  ),
                 ],
               ),
             ),
@@ -994,7 +1061,7 @@ class SettingsView extends GetView<SettingsController> {
             Expanded(
               child: Row(
                 children: [
-                  Container(
+                  Container(//语音服务图标
                     width: 32.w,
                     height: 32.w,
                     decoration: BoxDecoration(
@@ -1010,7 +1077,7 @@ class SettingsView extends GetView<SettingsController> {
                     ),
                   ),
                   SizedBox(width: 12.w),
-                  Flexible(
+                  Flexible(//语音服务标题和副标题
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [

lib/modules/translation/views/translation_view.dart

@@ -257,7 +257,7 @@ class TranslationView extends GetView<TranslationController> {
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Text(
-                '${item.sourceLanguageName} → ${item.targetLanguageName}',
+                '${item.sourceLanguageName.tr} → ${item.targetLanguageName.tr}',
                 style: TextStyle(
                   fontSize: 12,
                   color: Theme.of(context).textTheme.bodySmall?.color,