diff --git a/lib/core/translations/language/en_us.dart b/lib/core/translations/language/en_us.dart index 8d3cbab5b..f27326487 100644 --- a/lib/core/translations/language/en_us.dart +++ b/lib/core/translations/language/en_us.dart @@ -44,6 +44,8 @@ const Map enUS = { "userAgreement": "User Agreement", "privacyPolicy": "Privacy Policy", 'selectCountry':'Select Country/Region', + "email": "email", + "phoneNumber": "phoneNumber", // 首页 "deviceStatus": "Device Status", @@ -172,4 +174,112 @@ const Map enUS = { "editProfile": "Edit Profile", "nickname": "Nickname", "save": "Save", + + //国家列表 + "邮箱": "Email", + "中国": "China", + "美国": "United States", + "加拿大": "Canada", + "俄罗斯": "Russia", + "英国": "United Kingdom", + "德国": "Germany", + "意大利": "Italy", + "法国": "France", + "西班牙": "Spain", + "南非": "South Africa", + "沙特阿拉伯": "Saudi Arabia", + "土耳其": "Turkey", + "日本": "Japan", + "韩国": "South Korea", + "新加坡": "Singapore", + "马来西亚": "Malaysia", + "泰国": "Thailand", + "越南": "Vietnam", + "印度": "India", + "巴基斯坦": "Pakistan", + "菲律宾": "Philippines", + "印度尼西亚": "Indonesia", + "阿联酋": "United Arab Emirates", + "墨西哥": "Mexico", + "巴西": "Brazil", + "阿根廷": "Argentina", + "澳大利亚": "Australia", + "新西兰": "New Zealand", + "中国香港": "Hong Kong, China", + "中国澳门": "Macau, China", + "中国台湾": "Taiwan, China", + "埃及": "Egypt", + "希腊": "Greece", + "荷兰": "Netherlands", + "比利时": "Belgium", + "匈牙利": "Hungary", + "罗马尼亚": "Romania", + "瑞士": "Switzerland", + "奥地利": "Austria", + "丹麦": "Denmark", + "瑞典": "Sweden", + "挪威": "Norway", + "波兰": "Poland", + "秘鲁": "Peru", + "智利": "Chile", + "哥伦比亚": "Colombia", + "委内瑞拉": "Venezuela", + "葡萄牙": "Portugal", + "卢森堡": "Luxembourg", + "爱尔兰": "Ireland", + "冰岛": "Iceland", + "阿尔巴尼亚": "Albania", + "马耳他": "Malta", + "塞浦路斯": "Cyprus", + "芬兰": "Finland", + "保加利亚": "Bulgaria", + "立陶宛": "Lithuania", + "拉脱维亚": "Latvia", + "爱沙尼亚": "Estonia", + "乌克兰": "Ukraine", + "塞尔维亚": "Serbia", + "克罗地亚": "Croatia", + "斯洛文尼亚": "Slovenia", + "捷克": "Czech Republic", + "斯洛伐克": "Slovakia", + "危地马拉": "Guatemala", + "萨尔瓦多": "El Salvador", + "洪都拉斯": "Honduras", + "尼加拉瓜": "Nicaragua", + "哥斯达黎加": "Costa Rica", + "巴拿马": "Panama", + "海地": "Haiti", + "玻利维亚": "Bolivia", + "厄瓜多尔": "Ecuador", + "巴拉圭": "Paraguay", + "乌拉圭": "Uruguay", + "摩洛哥": "Morocco", + "阿尔及利亚": "Algeria", + "突尼斯": "Tunisia", + "尼日利亚": "Nigeria", + "加纳": "Ghana", + "埃塞俄比亚": "Ethiopia", + "肯尼亚": "Kenya", + "坦桑尼亚": "Tanzania", + "乌干达": "Uganda", + "孟加拉国": "Bangladesh", + "以色列": "Israel", + "黎巴嫩": "Lebanon", + "约旦": "Jordan", + "伊拉克": "Iraq", + "科威特": "Kuwait", + "巴林": "Bahrain", + "卡塔尔": "Qatar", + "阿曼": "Oman", + "阿富汗": "Afghanistan", + "斯里兰卡": "Sri Lanka", + "缅甸": "Myanmar", + "尼泊尔": "Nepal", + "蒙古": "Mongolia", + "柬埔寨": "Cambodia", + "老挝": "Laos", + "文莱": "Brunei", + "东帝汶": "East Timor", + "斐济": "Fiji", + "所罗门群岛": "Solomon Islands", }; diff --git a/lib/core/translations/language/zh_cn.dart b/lib/core/translations/language/zh_cn.dart index e1e33780b..f7d85537b 100644 --- a/lib/core/translations/language/zh_cn.dart +++ b/lib/core/translations/language/zh_cn.dart @@ -43,6 +43,9 @@ const Map zhCN = { "and": " 和 ", "userAgreement": "《用户协议》", "privacyPolicy": "《隐私政策》", + 'selectCountry': '选择国家/地区', + "email": "邮箱", + "phoneNumber": "手机号码", // 首页 "deviceStatus": "设备状态", @@ -150,7 +153,7 @@ const Map zhCN = { 'defaultTimbre': '默认音色', 'microsoftCloudTimbreService': '微软云端音色服务', 'voiceClone': '声音复刻', - 'selectCountry': '选择国家/地区', + // 聊天页 "clearChatHistory": "清空聊天记录", @@ -167,4 +170,112 @@ const Map zhCN = { "editProfile": "编辑个人信息", "nickname": "昵称", "save": "保存", + + //国家列表 + "邮箱": "邮箱", + "中国": "中国", + "美国": "美国", + "加拿大": "加拿大", + "俄罗斯": "俄罗斯", + "英国": "英国", + "德国": "德国", + "意大利": "意大利", + "法国": "法国", + "西班牙": "西班牙", + "南非": "南非", + "沙特阿拉伯": "沙特阿拉伯", + "土耳其": "土耳其", + "日本": "日本", + "韩国": "韩国", + "新加坡": "新加坡", + "马来西亚": "马来西亚", + "泰国": "泰国", + "越南": "越南", + "印度": "印度", + "巴基斯坦": "巴基斯坦", + "菲律宾": "菲律宾", + "印度尼西亚": "印度尼西亚", + "阿联酋": "阿联酋", + "墨西哥": "墨西哥", + "巴西": "巴西", + "阿根廷": "阿根廷", + "澳大利亚": "澳大利亚", + "新西兰": "新西兰", + "中国香港": "中国香港", + "中国澳门": "中国澳门", + "中国台湾": "中国台湾", + "埃及": "埃及", + "希腊": "希腊", + "荷兰": "荷兰", + "比利时": "比利时", + "匈牙利": "匈牙利", + "罗马尼亚": "罗马尼亚", + "瑞士": "瑞士", + "奥地利": "奥地利", + "丹麦": "丹麦", + "瑞典": "瑞典", + "挪威": "挪威", + "波兰": "波兰", + "秘鲁": "秘鲁", + "智利": "智利", + "哥伦比亚": "哥伦比亚", + "委内瑞拉": "委内瑞拉", + "葡萄牙": "葡萄牙", + "卢森堡": "卢森堡", + "爱尔兰": "爱尔兰", + "冰岛": "冰岛", + "阿尔巴尼亚": "阿尔巴尼亚", + "马耳他": "马耳他", + "塞浦路斯": "塞浦路斯", + "芬兰": "芬兰", + "保加利亚": "保加利亚", + "立陶宛": "立陶宛", + "拉脱维亚": "拉脱维亚", + "爱沙尼亚": "爱沙尼亚", + "乌克兰": "乌克兰", + "塞尔维亚": "塞尔维亚", + "克罗地亚": "克罗地亚", + "斯洛文尼亚": "斯洛文尼亚", + "捷克": "捷克", + "斯洛伐克": "斯洛伐克", + "危地马拉": "危地马拉", + "萨尔瓦多": "萨尔瓦多", + "洪都拉斯": "洪都拉斯", + "尼加拉瓜": "尼加拉瓜", + "哥斯达黎加": "哥斯达黎加", + "巴拿马": "巴拿马", + "海地": "海地", + "玻利维亚": "玻利维亚", + "厄瓜多尔": "厄瓜多尔", + "巴拉圭": "巴拉圭", + "乌拉圭": "乌拉圭", + "摩洛哥": "摩洛哥", + "阿尔及利亚": "阿尔及利亚", + "突尼斯": "突尼斯", + "尼日利亚": "尼日利亚", + "加纳": "加纳", + "埃塞俄比亚": "埃塞俄比亚", + "肯尼亚": "肯尼亚", + "坦桑尼亚": "坦桑尼亚", + "乌干达": "乌干达", + "孟加拉国": "孟加拉国", + "以色列": "以色列", + "黎巴嫩": "黎巴嫩", + "约旦": "约旦", + "伊拉克": "伊拉克", + "科威特": "科威特", + "巴林": "巴林", + "卡塔尔": "卡塔尔", + "阿曼": "阿曼", + "阿富汗": "阿富汗", + "斯里兰卡": "斯里兰卡", + "缅甸": "缅甸", + "尼泊尔": "尼泊尔", + "蒙古": "蒙古", + "柬埔寨": "柬埔寨", + "老挝": "老挝", + "文莱": "文莱", + "东帝汶": "东帝汶", + "斐济": "斐济", + "所罗门群岛": "所罗门群岛", }; diff --git a/lib/modules/common/webview_page.dart b/lib/modules/common/webview_page.dart index 2115b842a..daa78ecf2 100644 --- a/lib/modules/common/webview_page.dart +++ b/lib/modules/common/webview_page.dart @@ -12,19 +12,31 @@ class WebViewPage extends StatelessWidget { @override Widget build(BuildContext context) { + final isDarkMode = Theme.of(context).brightness == Brightness.dark; final controller = WebViewController() ..setJavaScriptMode(JavaScriptMode.unrestricted) ..loadRequest(Uri.parse(url)); return Scaffold( + backgroundColor: isDarkMode ? Colors.black : Colors.grey[50], appBar: AppBar( + centerTitle: true, title: Text(title), leading: IconButton( - icon: const Icon(Icons.arrow_back), - onPressed: () => Get.back(), + icon: Icon( + Icons.arrow_back_ios, + color: isDarkMode ? Colors.white : Colors.black, + size: 20.sp, ), + onPressed: () => Get.back(), + ), + backgroundColor: isDarkMode ? Colors.black : Colors.white, + foregroundColor: isDarkMode ? Colors.white : Colors.black, + elevation: 0, + ), + body: WebViewWidget( + controller: controller, ), - body: WebViewWidget(controller: controller), ); } } \ No newline at end of file diff --git a/lib/modules/login/controllers/login_controller.dart b/lib/modules/login/controllers/login_controller.dart index 3085c5996..a2c48118b 100644 --- a/lib/modules/login/controllers/login_controller.dart +++ b/lib/modules/login/controllers/login_controller.dart @@ -64,6 +64,82 @@ class LoginController extends GetxController { {'name': '中国香港', 'code': '+852', 'flag': '🇭🇰'}, {'name': '中国澳门', 'code': '+853', 'flag': '🇲🇴'}, {'name': '中国台湾', 'code': '+886', 'flag': '🇹🇼'}, + + // 添加的其他主要国家 + {'name': '埃及', 'code': '+20', 'flag': '🇪🇬'}, + {'name': '希腊', 'code': '+30', 'flag': '🇬🇷'}, + {'name': '荷兰', 'code': '+31', 'flag': '🇳🇱'}, + {'name': '比利时', 'code': '+32', 'flag': '🇧🇪'}, + {'name': '匈牙利', 'code': '+36', 'flag': '🇭🇺'}, + {'name': '罗马尼亚', 'code': '+40', 'flag': '🇷🇴'}, + {'name': '瑞士', 'code': '+41', 'flag': '🇨🇭'}, + {'name': '奥地利', 'code': '+43', 'flag': '🇦🇹'}, + {'name': '丹麦', 'code': '+45', 'flag': '🇩🇰'}, + {'name': '瑞典', 'code': '+46', 'flag': '🇸🇪'}, + {'name': '挪威', 'code': '+47', 'flag': '🇳🇴'}, + {'name': '波兰', 'code': '+48', 'flag': '🇵🇱'}, + {'name': '秘鲁', 'code': '+51', 'flag': '🇵🇪'}, + {'name': '智利', 'code': '+56', 'flag': '🇨🇱'}, + {'name': '哥伦比亚', 'code': '+57', 'flag': '🇨🇴'}, + {'name': '委内瑞拉', 'code': '+58', 'flag': '🇻🇪'}, + {'name': '葡萄牙', 'code': '+351', 'flag': '🇵🇹'}, + {'name': '卢森堡', 'code': '+352', 'flag': '🇱🇺'}, + {'name': '爱尔兰', 'code': '+353', 'flag': '🇮🇪'}, + {'name': '冰岛', 'code': '+354', 'flag': '🇮🇸'}, + {'name': '阿尔巴尼亚', 'code': '+355', 'flag': '🇦🇱'}, + {'name': '马耳他', 'code': '+356', 'flag': '🇲🇹'}, + {'name': '塞浦路斯', 'code': '+357', 'flag': '🇨🇾'}, + {'name': '芬兰', 'code': '+358', 'flag': '🇫🇮'}, + {'name': '保加利亚', 'code': '+359', 'flag': '🇧🇬'}, + {'name': '立陶宛', 'code': '+370', 'flag': '🇱🇹'}, + {'name': '拉脱维亚', 'code': '+371', 'flag': '🇱🇻'}, + {'name': '爱沙尼亚', 'code': '+372', 'flag': '🇪🇪'}, + {'name': '乌克兰', 'code': '+380', 'flag': '🇺🇦'}, + {'name': '塞尔维亚', 'code': '+381', 'flag': '🇷🇸'}, + {'name': '克罗地亚', 'code': '+385', 'flag': '🇭🇷'}, + {'name': '斯洛文尼亚', 'code': '+386', 'flag': '🇸🇮'}, + {'name': '捷克', 'code': '+420', 'flag': '🇨🇿'}, + {'name': '斯洛伐克', 'code': '+421', 'flag': '🇸🇰'}, + {'name': '危地马拉', 'code': '+502', 'flag': '🇬🇹'}, + {'name': '萨尔瓦多', 'code': '+503', 'flag': '🇸🇻'}, + {'name': '洪都拉斯', 'code': '+504', 'flag': '🇭🇳'}, + {'name': '尼加拉瓜', 'code': '+505', 'flag': '🇳🇮'}, + {'name': '哥斯达黎加', 'code': '+506', 'flag': '🇨🇷'}, + {'name': '巴拿马', 'code': '+507', 'flag': '🇵🇦'}, + {'name': '海地', 'code': '+509', 'flag': '🇭🇹'}, + {'name': '玻利维亚', 'code': '+591', 'flag': '🇧🇴'}, + {'name': '厄瓜多尔', 'code': '+593', 'flag': '🇪🇨'}, + {'name': '巴拉圭', 'code': '+595', 'flag': '🇵🇾'}, + {'name': '乌拉圭', 'code': '+598', 'flag': '🇺🇾'}, + {'name': '摩洛哥', 'code': '+212', 'flag': '🇲🇦'}, + {'name': '阿尔及利亚', 'code': '+213', 'flag': '🇩🇿'}, + {'name': '突尼斯', 'code': '+216', 'flag': '🇹🇳'}, + {'name': '尼日利亚', 'code': '+234', 'flag': '🇳🇬'}, + {'name': '加纳', 'code': '+233', 'flag': '🇬🇭'}, + {'name': '埃塞俄比亚', 'code': '+251', 'flag': '🇪🇹'}, + {'name': '肯尼亚', 'code': '+254', 'flag': '🇰🇪'}, + {'name': '坦桑尼亚', 'code': '+255', 'flag': '🇹🇿'}, + {'name': '乌干达', 'code': '+256', 'flag': '🇺🇬'}, + {'name': '孟加拉国', 'code': '+880', 'flag': '🇧🇩'}, + {'name': '以色列', 'code': '+972', 'flag': '🇮🇱'}, + {'name': '黎巴嫩', 'code': '+961', 'flag': '🇱🇧'}, + {'name': '约旦', 'code': '+962', 'flag': '🇯🇴'}, + {'name': '伊拉克', 'code': '+964', 'flag': '🇮🇶'}, + {'name': '科威特', 'code': '+965', 'flag': '🇰🇼'}, + {'name': '巴林', 'code': '+973', 'flag': '🇧🇭'}, + {'name': '卡塔尔', 'code': '+974', 'flag': '🇶🇦'}, + {'name': '阿曼', 'code': '+968', 'flag': '🇴🇲'}, + {'name': '阿富汗', 'code': '+93', 'flag': '🇦🇫'}, + {'name': '斯里兰卡', 'code': '+94', 'flag': '🇱🇰'}, + {'name': '缅甸', 'code': '+95', 'flag': '🇲🇲'}, + {'name': '尼泊尔', 'code': '+977', 'flag': '🇳🇵'}, + {'name': '蒙古', 'code': '+976', 'flag': '🇲🇳'}, + {'name': '柬埔寨', 'code': '+855', 'flag': '🇰🇭'}, + {'name': '老挝', 'code': '+856', 'flag': '🇱🇦'}, + {'name': '文莱', 'code': '+673', 'flag': '🇧🇳'}, + {'name': '东帝汶', 'code': '+670', 'flag': '🇹🇱'}, + {'name': '斐济', 'code': '+679', 'flag': '🇫🇯'}, + {'name': '所罗门群岛', 'code': '+677', 'flag': '🇸🇧'}, ]; // 状态管理 diff --git a/lib/modules/login/views/login_view.dart b/lib/modules/login/views/login_view.dart index 0a4146393..d0c0f9239 100644 --- a/lib/modules/login/views/login_view.dart +++ b/lib/modules/login/views/login_view.dart @@ -293,7 +293,7 @@ class LoginView extends GetView { style: TextStyle(fontSize: 24.sp), ), title: Text( - country['name']!, + '${country['name']}'.tr, style: TextStyle( color: isDarkMode ? Colors.white : Colors.black, ), @@ -530,8 +530,8 @@ class LoginView extends GetView { GestureDetector( onTap: () { String url = 'https://www.deepsoud.com/yhxy.html'; - //print('----------${Get.locale?.toString()}'); - if (Get.locale?.toString() != 'zh_Hans_CN') { + print('----------${Get.locale?.toString()}'); + if (Get.locale?.toString() != 'zh_CN') { url = 'https://www.deepsoud.com/yhxy_en.html'; } Get.to(() => WebViewPage( @@ -557,7 +557,7 @@ class LoginView extends GetView { GestureDetector( onTap: () { String url = 'https://www.deepsoud.com/ysxy.html'; - if (Get.locale?.toString() != 'zh_Hans_CN') { + if (Get.locale?.toString() != 'zh_CN') { url = 'https://www.deepsoud.com/ysxy_en.html'; } Get.to(() => WebViewPage( diff --git a/lib/modules/profile/views/profile_view.dart b/lib/modules/profile/views/profile_view.dart index bb2771b08..ff1fc4ad7 100644 --- a/lib/modules/profile/views/profile_view.dart +++ b/lib/modules/profile/views/profile_view.dart @@ -150,8 +150,8 @@ class EditProfileView extends GetView { backgroundColor: isDarkMode ? Colors.black : Colors.white, leading: IconButton( icon: Icon( - Icons.arrow_back, - size: 24.sp, + Icons.arrow_back_ios, + size: 20.sp, color: isDarkMode? Colors.white : Colors.black, ), onPressed: () => Get.back(),