diff --git a/lib/modules/profile/controllers/profile_controller.dart b/lib/modules/profile/controllers/profile_controller.dart index bad58d057..d3e2645ea 100644 --- a/lib/modules/profile/controllers/profile_controller.dart +++ b/lib/modules/profile/controllers/profile_controller.dart @@ -12,6 +12,9 @@ import 'package:flutter_image_compress/flutter_image_compress.dart'; import 'package:path_provider/path_provider.dart'; import '../../../data/services/network/api.dart'; import 'package:dio/dio.dart'; +import '../../../routes/app_routes.dart'; +import '../../../modules/login/controllers/googleLogin.dart'; +import '../../../modules/login/controllers/facebookLogin.dart'; class ProfileController extends GetxController { static ProfileController get to => Get.find(); @@ -364,4 +367,80 @@ class ProfileController extends GetxController { Get.snackbar('错误', '更新用户名和头像失败'); } } + + Future signOut() async { + try { + //显示加载提示 + // Get.dialog( + // const Center(child: CircularProgressIndicator()), + // barrierDismissible: false, + // ); + + // 清理所有存储 + await _storage.erase(); + // 或者逐个清理关键存储项 + await _storage.write("logintoken", null); + await _storage.write("user_info", null); + await _storage.write("local_avatar", null); + print('清理存储成功'); + + // 第三方登录退出 + try { + final google = Google(); + final facebook = Facebook(); + await Future.wait([ + google.signOutGoogle(), + facebook.signOutFacebook(), + ]); + } catch (e) { + print('第三方登录退出错误: $e'); + // 继续执行，不中断退出流程 + } + + // 关闭加载提示 + //Get.back(); + + // 确保导航到登录页面 + if (Get.currentRoute != Routes.login) { + await Get.offAllNamed(Routes.login); + } + + Get.snackbar('成功', '已退出登录'); + print('退出登录成功'); + } catch (e) { + //Get.back(); // 关闭加载提示 + Get.snackbar('错误', '退出登录失败，请重试'); + print('退出登录错误: $e'); + } + } + + // 注销账号 + Future 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'); + } + } } diff --git a/lib/modules/profile/views/profile_view.dart b/lib/modules/profile/views/profile_view.dart index ff1fc4ad7..a2acf36da 100644 --- a/lib/modules/profile/views/profile_view.dart +++ b/lib/modules/profile/views/profile_view.dart @@ -5,6 +5,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import '../../../core/widgets/common_bottom_nav.dart'; import '../../../routes/app_routes.dart'; import 'dart:io'; +import 'dart:ui'; +import '../../common/webview_page.dart'; // ProfileView: 用户设置页面 class ProfileView extends GetView { @@ -143,6 +145,7 @@ class EditProfileView extends GetView { TextEditingController(text: controller.userInfo.value.name); return Scaffold( + resizeToAvoidBottomInset: false, // 添加这一行，防止键盘挤压内容 appBar: AppBar( automaticallyImplyLeading: false, centerTitle: true, @@ -156,107 +159,729 @@ class EditProfileView extends GetView { ), onPressed: () => Get.back(), ), - title: Text( - 'editProfile'.tr, - style: TextStyle( - fontSize: 17.sp, - fontWeight: FontWeight.w600, - color: isDarkMode ? Colors.white : Colors.black, + // title: Text( + // 'editProfile'.tr, + // style: TextStyle( + // fontSize: 17.sp, + // fontWeight: FontWeight.w600, + // color: isDarkMode ? Colors.white : Colors.black, + // ), + // ), + actions: [ + TextButton( + onPressed: () { + // 保存用户名 + controller.updateUserNameAndAvatar(nameController.text); + // 返回上一级页面 + Get.back(); + }, + child: Text( + 'save'.tr, + style: TextStyle( + fontSize: 16.sp, + color: isDarkMode ? Colors.blue[300] : Colors.blue, + fontWeight: FontWeight.w500, + ), + ), + ), + ], + ), + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h), + child: + Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + _buildEditProfileSection(context, isDarkMode, nameController), + SizedBox(height: 16.h), + _buildAccountSettings(isDarkMode), + SizedBox(height: 16.h), + ]))); + } + + // 新增：构建编辑资料区域的方法 + Widget _buildEditProfileSection(BuildContext context, bool isDarkMode, + TextEditingController nameController) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only(left: 4.w, bottom: 8.h), + child: Text( + 'editProfile'.tr, // 编辑资料 + style: TextStyle( + fontSize: 12.sp, + fontWeight: FontWeight.w500, + color: isDarkMode ? Colors.blue[400] : Colors.blue[600], + letterSpacing: 1, + ), ), ), - ), - body: Padding( - padding: EdgeInsets.all(16.w), - child: Column( - children: [ - // 头像编辑 - Center( - child: GestureDetector( - onTap: () => controller.updateUserAvatar(), - child: Stack( - children: [ - Obx(() => CircleAvatar( - radius: 50.r, - backgroundImage: controller.localAvatar.value.isNotEmpty - ? FileImage(File(controller.localAvatar.value)) - : (controller.userInfo.value.avatar.isNotEmpty - ? NetworkImage( - controller.userInfo.value.avatar) - : null) as ImageProvider?, - child: controller.userInfo.value.avatar.isEmpty - ? Icon(Icons.person, size: 50.r) - : null, - )), - Positioned( - right: 0, - bottom: 0, - child: Container( - padding: EdgeInsets.all(4.w), - decoration: const BoxDecoration( - color: Colors.blue, - shape: BoxShape.circle, - ), - child: Icon( - Icons.camera_alt, - size: 20.w, - color: Colors.white, - )), - ) - ], - )), + Container( + decoration: BoxDecoration( + color: isDarkMode ? Colors.white.withOpacity(0.05) : Colors.white, + borderRadius: BorderRadius.circular(16.r), + boxShadow: [ + BoxShadow( + color: isDarkMode + ? Colors.black.withOpacity(0.2) + : Colors.black.withOpacity(0.05), + blurRadius: 10, + offset: const Offset(0, 2), + ), + ], + ), + child: ClipRRect( + borderRadius: BorderRadius.circular(16.r), + child: BackdropFilter( + // 保留毛玻璃效果（如果需要） + filter: isDarkMode + ? ImageFilter.blur(sigmaX: 5, sigmaY: 5) + : ImageFilter.blur(sigmaX: 0, sigmaY: 0), + child: Column( + children: [ + // 头像设置项 + _buildAvatarSetting(isDarkMode), + Divider( + height: 1, + color: isDarkMode + ? Colors.white.withOpacity(0.1) + : Colors.grey[200]), + // 昵称设置项 + _buildNicknameSetting(context, isDarkMode, nameController), + ], + ), ), - SizedBox(height: 20.h), + ), + ), + ], + ); + } - // 昵称编辑 - 使用外部定义的controller而不是每次重建 + // 新增：构建头像设置项 + Widget _buildAvatarSetting(bool isDarkMode) { + return InkWell( + onTap: () => controller.updateUserAvatar(), + child: Padding( + padding: + EdgeInsets.symmetric(horizontal: 16.w, vertical: 4.h), // 调整垂直间距 + child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, // 移除，让内容自然排列 + children: [ + // --- 添加图标 --- + Container( + width: 32.w, + height: 32.w, + decoration: BoxDecoration( + color: isDarkMode + ? Colors.blue[900]!.withOpacity(0.3) // 使用示例颜色 + : Colors.blue[50]!, // 使用示例颜色 + borderRadius: BorderRadius.circular(16.r), // 图标背景圆角 + ), + child: Icon( + Icons.account_circle_outlined, // 头像图标 + size: 18.w, + color: + isDarkMode ? Colors.blue[300]! : Colors.blue[600]!, // 图标颜色 + ), + ), + SizedBox(width: 12.w), // 图标和文字间距 + // --- --- + Expanded( + // 让文字占据剩余空间 + child: Text( + 'avatar'.tr, // 头像 + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.w500, + color: isDarkMode ? Colors.white : Colors.black87, + ), + ), + ), + // --- 右侧内容保持不变 --- Row( children: [ - Expanded( - child: TextField( - controller: nameController, - decoration: InputDecoration( - labelText: 'nickname'.tr, - border: const OutlineInputBorder(), - suffixIcon: nameController.text.isNotEmpty - ? IconButton( - icon: const Icon(Icons.clear), - onPressed: () { - nameController.clear(); - }, - ) + Obx(() => CircleAvatar( + radius: 30.r, // 调整头像大小以适应行高 + backgroundImage: controller.localAvatar.value.isNotEmpty + ? FileImage(File(controller.localAvatar.value)) + : (controller.userInfo.value.avatar.isNotEmpty + ? NetworkImage(controller.userInfo.value.avatar) + : null) as ImageProvider?, + child: (controller.localAvatar.value.isEmpty && + controller.userInfo.value.avatar.isEmpty) + ? Icon(Icons.person, + size: 20.r, color: Colors.grey) // 默认图标 : null, - ), + backgroundColor: Colors.grey[200], // 添加背景色防止透明图片问题 + )), + SizedBox(width: 8.w), + Container( + width: 32.w, + height: 32.w, + decoration: BoxDecoration( + color: isDarkMode + ? Colors.white.withOpacity(0.05) + : Colors.grey[100], + borderRadius: BorderRadius.circular(16.r), + ), + child: Icon( + Icons.chevron_right, + size: 16.w, + color: isDarkMode ? Colors.white70 : Colors.grey[500], ), ), ], ), - // ... 其他编辑项 ... + // --- --- + ], + ), + ), + ); + } - SizedBox(height: 30.h), - // 添加一个大的保存按钮 - SizedBox( - width: double.infinity, - height: 50.h, - child: ElevatedButton( - onPressed: () { - // 保存用户名 - controller.updateUserNameAndAvatar(nameController.text); - // 返回上一级页面 - Get.back(); - }, - style: ElevatedButton.styleFrom( - backgroundColor: isDarkMode ? Colors.blue[700] : Colors.blue, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10.r), - ), + // 新增：构建昵称设置项 + Widget _buildNicknameSetting(BuildContext context, bool isDarkMode, + TextEditingController nameController) { + return InkWell( + onTap: () => _showEditNicknameDialog(context, isDarkMode, nameController), + child: Padding( + padding: + EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h), // 调整垂直间距 + child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, // 移除 + children: [ + // --- 添加图标 --- + Container( + width: 32.w, + height: 32.w, + decoration: BoxDecoration( + color: isDarkMode + ? Colors.green[900]!.withOpacity(0.3) // 使用示例颜色 + : Colors.green[50]!, // 使用示例颜色 + borderRadius: BorderRadius.circular(16.r), // 图标背景圆角 + ), + child: Icon( + Icons.edit_outlined, // 编辑图标 + size: 18.w, + color: isDarkMode + ? Colors.green[300]! + : Colors.green[600]!, // 图标颜色 + ), + ), + SizedBox(width: 12.w), // 图标和文字间距 + // --- --- + Expanded( + // 让文字占据剩余空间 + child: Text( + 'nickname'.tr, // 名字 + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.w500, + color: isDarkMode ? Colors.white : Colors.black87, ), - child: Text( - 'save'.tr, - style: TextStyle( - fontSize: 16.sp, - color: Colors.white, - fontWeight: FontWeight.w500, + ), + ), + // --- 右侧内容保持不变 --- + Row( + children: [ + // 使用 Obx 监听 userInfo 的变化来显示昵称 + Obx(() => Text( + controller.userInfo.value.name.isNotEmpty + ? controller.userInfo.value.name + : 'notSet'.tr, // 未设置 + style: TextStyle( + fontSize: 14.sp, + color: isDarkMode ? Colors.white70 : Colors.grey[600], + ), + overflow: TextOverflow.ellipsis, + )), + SizedBox(width: 8.w), + Container( + width: 32.w, + height: 32.w, + decoration: BoxDecoration( + color: isDarkMode + ? Colors.white.withOpacity(0.05) + : Colors.grey[100], + borderRadius: BorderRadius.circular(16.r), + ), + child: Icon( + Icons.chevron_right, + size: 16.w, + color: isDarkMode ? Colors.white70 : Colors.grey[500], ), ), + ], + ), + // --- --- + ], + ), + ), + ); + } + + // 新增：显示编辑昵称对话框的方法 + void _showEditNicknameDialog(BuildContext context, bool isDarkMode, + TextEditingController nameController) { + // 创建一个临时的 Controller，用于对话框内的编辑，避免直接修改主 nameController + final dialogNameController = + TextEditingController(text: nameController.text); + + Get.dialog( + AlertDialog( + backgroundColor: isDarkMode ? Colors.grey[900] : Colors.white, + title: Text( + 'editNickname'.tr, // 编辑昵称 + style: TextStyle(color: isDarkMode ? Colors.white : Colors.black87), + ), + content: TextField( + controller: dialogNameController, // 使用对话框的 Controller + autofocus: true, + decoration: InputDecoration( + hintText: 'enterNickname'.tr, // 请输入昵称 + hintStyle: + TextStyle(color: isDarkMode ? Colors.white54 : Colors.black38), + // 可以添加其他样式，如边框 + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(8.r), + borderSide: BorderSide( + color: isDarkMode ? Colors.white38 : Colors.grey[400]!), + ), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(8.r), + borderSide: BorderSide( + color: isDarkMode ? Colors.white38 : Colors.grey[400]!), + ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(8.r), + borderSide: BorderSide( + color: isDarkMode ? Colors.blue[300]! : Colors.blue), + ), + ), + style: TextStyle(color: isDarkMode ? Colors.white : Colors.black87), + ), + actions: [ + TextButton( + onPressed: () => Get.back(), + child: Text( + 'cancel'.tr, + style: TextStyle( + color: isDarkMode ? Colors.white70 : Colors.black54), + ), + ), + TextButton( + onPressed: () { + // 确认时，将对话框输入的值更新回主 nameController + nameController.text = dialogNameController.text; + Get.back(); // 关闭对话框 + // 注意：实际的保存操作由 AppBar 中的保存按钮触发 + }, + child: Text( + 'confirm'.tr, + style: + TextStyle(color: isDarkMode ? Colors.blue[300] : Colors.blue), + ), + ), + ], + ), + ); + } + + // _buildEditProfile(bool isDarkMode, TextEditingController nameController) { + // return + // //Padding( + // //padding: EdgeInsets.all(16.w), + // //child: + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: EdgeInsets.only(left: 4.w, bottom: 8.h), + // child: Text( + // 'editProfile'.tr, // 账号设置 + // style: TextStyle( + // fontSize: 12.sp, + // fontWeight: FontWeight.w500, + // color: isDarkMode ? Colors.blue[400] : Colors.blue[600], + // letterSpacing: 1, + // ), + // ), + // ), + // // 头像编辑 + // Center( + // child: GestureDetector( + // onTap: () => controller.updateUserAvatar(), + // child: Stack( + // children: [ + // Obx(() => CircleAvatar( + // radius: 50.r, + // backgroundImage: controller.localAvatar.value.isNotEmpty + // ? FileImage(File(controller.localAvatar.value)) + // : (controller.userInfo.value.avatar.isNotEmpty + // ? NetworkImage(controller.userInfo.value.avatar) + // : null) as ImageProvider?, + // child: controller.userInfo.value.avatar.isEmpty + // ? Icon(Icons.person, size: 50.r) + // : null, + // )), + // Positioned( + // right: 0, + // bottom: 0, + // child: Container( + // padding: EdgeInsets.all(4.w), + // decoration: const BoxDecoration( + // color: Colors.blue, + // shape: BoxShape.circle, + // ), + // child: Icon( + // Icons.camera_alt, + // size: 20.w, + // color: Colors.white, + // )), + // ) + // ], + // )), + // ), + // SizedBox(height: 20.h), + + // // 昵称编辑 - 使用外部定义的controller而不是每次重建 + // Row( + // children: [ + // Expanded( + // child: TextField( + // controller: nameController, + // decoration: InputDecoration( + // labelText: 'nickname'.tr, + // border: const OutlineInputBorder(), + // suffixIcon: nameController.text.isNotEmpty + // ? IconButton( + // icon: const Icon(Icons.clear), + // onPressed: () { + // nameController.clear(); + // }, + // ) + // : null, + // ), + // ), + // ), + // ], + // ), + // ], + // //), + // ); + // } + + Widget _buildAccountSettings(bool isDarkMode) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only(left: 4.w, bottom: 8.h), + child: Text( + 'AccountSetting'.tr, // 账号设置 + style: TextStyle( + fontSize: 12.sp, + fontWeight: FontWeight.w500, + color: isDarkMode ? Colors.blue[400] : Colors.blue[600], + letterSpacing: 1, + ), + ), + ), + Container( + decoration: BoxDecoration( + color: isDarkMode ? Colors.white.withOpacity(0.05) : Colors.white, + borderRadius: BorderRadius.circular(16.r), + boxShadow: [ + BoxShadow( + color: isDarkMode + ? Colors.black.withOpacity(0.2) + : Colors.black.withOpacity(0.05), + blurRadius: 10, + offset: const Offset(0, 2), + ), + ], + ), + child: ClipRRect( + borderRadius: BorderRadius.circular(16.r), + child: BackdropFilter( + filter: isDarkMode + ? ImageFilter.blur(sigmaX: 5, sigmaY: 5) + : ImageFilter.blur(sigmaX: 0, sigmaY: 0), + child: Column( + children: [ + // 用户协议 + _buildSimpleNavigationSetting( + title: 'userAgreement'.tr, // 用户协议 + icon: Icons.description_outlined, + iconBgColor: isDarkMode + ? Colors.purple[900]!.withOpacity(0.3) + : Colors.purple[50]!, + iconColor: + isDarkMode ? Colors.purple[300]! : Colors.purple[600]!, + titleColor: isDarkMode ? Colors.white : Colors.black87, + onTap: () { + String url = 'https://www.deepsoud.com/yhxy.html'; + if (Get.locale?.toString() != 'zh_CN') { + url = 'https://www.deepsoud.com/yhxy_en.html'; + } + Get.to(() => WebViewPage( + url: url, + title: 'userAgreement'.tr, + )); + }, + isDarkMode: isDarkMode, + ), + Divider( + height: 1, + color: isDarkMode + ? Colors.white.withOpacity(0.1) + : Colors.grey[200]), + + // 隐私政策 + _buildSimpleNavigationSetting( + title: 'privacyPolicy'.tr, // 隐私政策 + icon: Icons.privacy_tip_outlined, + iconBgColor: isDarkMode + ? Colors.purple[900]!.withOpacity(0.3) + : Colors.purple[50]!, + iconColor: + isDarkMode ? Colors.purple[300]! : Colors.purple[600]!, + titleColor: isDarkMode ? Colors.white : Colors.black87, + onTap: () { + String url = 'https://www.deepsoud.com/ysxy.html'; + if (Get.locale?.toString() != 'zh_CN') { + url = 'https://www.deepsoud.com/ysxy_en.html'; + } + Get.to(() => WebViewPage( + url: url, + title: 'privacyPolicy'.tr, + )); + }, + isDarkMode: isDarkMode, + ), + Divider( + height: 1, + color: isDarkMode + ? Colors.white.withOpacity(0.1) + : Colors.grey[200]), + // 退出登录 + _buildSimpleNavigationSetting( + title: 'logout'.tr, // 退出登录 + icon: Icons.logout, + 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( + 'logout'.tr, // 退出登录 + style: TextStyle( + color: isDarkMode ? Colors.white : Colors.black87, + ), + ), + content: Text( + 'logoutTips'.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.signOut(); + }, + child: Text( + 'confirm'.tr, // 确定 + style: TextStyle( + color: isDarkMode + ? Colors.red[300] + : Colors.red[600], + ), + ), + ), + ], + ), + ); + }, + 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, + ), + ], + ), + ), + ), + ), + ], + ); + } + + // 简单导航设置项 + Widget _buildSimpleNavigationSetting({ + required String title, + String? subtitle, + required IconData icon, + required Color iconBgColor, + required Color iconColor, + Color? titleColor, + Color? subtitleColor, + required VoidCallback onTap, + required bool isDarkMode, + }) { + return InkWell( + onTap: onTap, + child: Padding( + padding: EdgeInsets.all(16.w), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Row( + children: [ + Container( + width: 32.w, + height: 32.w, + decoration: BoxDecoration( + color: iconBgColor, + borderRadius: BorderRadius.circular(16.r), + ), + child: Icon( + icon, + size: 16.w, + color: iconColor, + ), + ), + SizedBox(width: 12.w), + Flexible( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + title, + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.w500, + color: titleColor ?? + (isDarkMode ? Colors.white : Colors.black87), + ), + overflow: TextOverflow.ellipsis, + ), + if (subtitle != null) SizedBox(height: 2.h), + if (subtitle != null) + Text( + subtitle, + style: TextStyle( + fontSize: 12.sp, + color: subtitleColor ?? + (isDarkMode + ? Colors.white70 + : Colors.black54), + ), + overflow: TextOverflow.ellipsis, + ), + ], + ), + ), + ], + ), + ), + Container( + width: 32.w, + height: 32.w, + decoration: BoxDecoration( + color: isDarkMode + ? Colors.white.withOpacity(0.05) + : Colors.grey[100], + borderRadius: BorderRadius.circular(16.r), + ), + child: Icon( + Icons.chevron_right, + size: 16.w, + color: isDarkMode ? Colors.white70 : Colors.grey[500], ), ), ], diff --git a/lib/modules/settings/controllers/settings_controller.dart b/lib/modules/settings/controllers/settings_controller.dart index 09fc1c2d3..05bca4804 100644 --- a/lib/modules/settings/controllers/settings_controller.dart +++ b/lib/modules/settings/controllers/settings_controller.dart @@ -8,13 +8,10 @@ import '../../../data/services/speech_factory.dart'; import '../models/language_model.dart'; import 'package:logger/logger.dart'; import '../../../data/models/user_Info.dart'; -import '../../../modules/login/controllers/googleLogin.dart'; -import '../../../modules/login/controllers/facebookLogin.dart'; + 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 { // 语言设置 @@ -327,80 +324,4 @@ class SettingsController extends GetxController { sourceLanguage.value = targetLanguage.value; targetLanguage.value = temp; } - - Future signOut() async { - try { - //显示加载提示 - // Get.dialog( - // const Center(child: CircularProgressIndicator()), - // barrierDismissible: false, - // ); - - // 清理所有存储 - await _storage.erase(); - // 或者逐个清理关键存储项 - await _storage.write("logintoken", null); - await _storage.write("user_info", null); - await _storage.write("local_avatar", null); - print('清理存储成功'); - - // 第三方登录退出 - try { - final google = Google(); - final facebook = Facebook(); - await Future.wait([ - google.signOutGoogle(), - facebook.signOutFacebook(), - ]); - } catch (e) { - print('第三方登录退出错误: $e'); - // 继续执行，不中断退出流程 - } - - // 关闭加载提示 - //Get.back(); - - // 确保导航到登录页面 - if (Get.currentRoute != Routes.login) { - await Get.offAllNamed(Routes.login); - } - - Get.snackbar('成功', '已退出登录'); - print('退出登录成功'); - } catch (e) { - //Get.back(); // 关闭加载提示 - Get.snackbar('错误', '退出登录失败，请重试'); - print('退出登录错误: $e'); - } - } - - // 注销账号 - Future 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'); - } - } } diff --git a/lib/modules/settings/views/settings_view.dart b/lib/modules/settings/views/settings_view.dart index 66f2d4749..5a12ef143 100644 --- a/lib/modules/settings/views/settings_view.dart +++ b/lib/modules/settings/views/settings_view.dart @@ -59,7 +59,9 @@ class SettingsView extends GetView { // 用户信息卡片 Widget _buildUserInfoCard(bool isDarkMode) { - return Container( + return GestureDetector( + onTap: () => Get.toNamed(Routes.editProfile), + child: Container( padding: EdgeInsets.all(16.w), decoration: BoxDecoration( gradient: LinearGradient( @@ -113,10 +115,6 @@ class SettingsView extends GetView { borderRadius: BorderRadius.circular(30.r), child: controller.userInfo.value.avatar.isEmpty ? - // Image.network( - // 'https://images.unsplash.com/photo-1534528741775-53994a69daeb?ixlib=rb-1.2.1&auto=format&fit=crop&w=200&q=80', - // fit: BoxFit.cover, // 图片填充方式 - // ) Container( decoration: BoxDecoration( color: Colors.blue[600], @@ -124,7 +122,8 @@ class SettingsView extends GetView { ), child: Center( child: Text( - controller.userInfo.value.name.isNotEmpty + controller + .userInfo.value.name.isNotEmpty ? controller.userInfo.value.name[0] .toUpperCase() : '?', @@ -200,7 +199,8 @@ class SettingsView extends GetView { 1: 'standardUser', //'标准用户' 2: 'proUser', //'专业用户' }; - final membershipString = membershipMap[controller + final membershipString = membershipMap[ + controller .userInfo.value.membershipLevel] ?? 'Unknown'; return Text( @@ -212,24 +212,24 @@ class SettingsView extends GetView { ); }), ), - SizedBox(width: 8.w), - Flexible( - child: Text( - '${'joinDevice'.tr} DeepSound Pro', // 已连接设备: - style: TextStyle( - fontSize: 12.sp, - color: isDarkMode - ? Colors.white70 - : Colors.black54, - ), - overflow: TextOverflow.ellipsis, - ), - ), + // SizedBox(width: 8.w), + // Flexible( + // child: Text( + // '${'joinDevice'.tr} DeepSound Pro', // 已连接设备: + // style: TextStyle( + // fontSize: 12.sp, + // color: isDarkMode + // ? Colors.white70 + // : Colors.black54, + // ), + // overflow: TextOverflow.ellipsis, + // ), + // ), ], ), SizedBox(height: 4.h), Text( - controller.userInfo.value.uid, + 'ID:${controller.userInfo.value.uid}', style: TextStyle( fontSize: 12.sp, color: isDarkMode ? Colors.white70 : Colors.black54, @@ -265,6 +265,7 @@ class SettingsView extends GetView { ), )), ], + ), ), ), ), @@ -566,133 +567,133 @@ class SettingsView extends GetView { : Colors.grey[200]), // 退出登录 - _buildSimpleNavigationSetting( - title: 'logout'.tr, // 退出登录 - icon: Icons.logout, - 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( - 'logout'.tr, // 退出登录 - style: TextStyle( - color: isDarkMode ? Colors.white : Colors.black87, - ), - ), - content: Text( - 'logoutTips'.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.signOut(); - }, - child: Text( - 'confirm'.tr, // 确定 - style: TextStyle( - color: isDarkMode - ? Colors.red[300] - : Colors.red[600], - ), - ), - ), - ], - ), - ); - }, - isDarkMode: isDarkMode, - ), - Divider( - height: 1, - color: isDarkMode - ? Colors.white.withOpacity(0.1) - : Colors.grey[200]), + // _buildSimpleNavigationSetting( + // title: 'logout'.tr, // 退出登录 + // icon: Icons.logout, + // 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( + // 'logout'.tr, // 退出登录 + // style: TextStyle( + // color: isDarkMode ? Colors.white : Colors.black87, + // ), + // ), + // content: Text( + // 'logoutTips'.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.signOut(); + // }, + // child: Text( + // 'confirm'.tr, // 确定 + // style: TextStyle( + // color: isDarkMode + // ? Colors.red[300] + // : Colors.red[600], + // ), + // ), + // ), + // ], + // ), + // ); + // }, + // 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, - ), + // _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, + // ), ], ), ),