diff --git a/lib/main_local.dart b/lib/main_local.dart index bd256362..9e30d007 100755 --- a/lib/main_local.dart +++ b/lib/main_local.dart @@ -4,7 +4,7 @@ import 'flavors.dart'; import 'main.dart' as runner; Future main() async { - F.appFlavor = Flavor.sky; + F.appFlavor = Flavor.xhj; // AppLog.log('local调用了main函数'); await runner.main(); } diff --git a/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart b/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart index 86e75fe5..a5a83f84 100755 --- a/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart +++ b/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart @@ -5,6 +5,7 @@ import 'package:star_lock/mine/mineMultiLanguage/mineMultiLanguage_state.dart'; import 'package:star_lock/translations/current_locale_tool.dart'; import '../../app_settings/app_colors.dart'; +import '../../app_settings/app_settings.dart'; import '../../tools/commonItem.dart'; import '../../tools/titleAppBar.dart'; import '../../translations/app_dept.dart'; @@ -86,6 +87,8 @@ class _MineMultiLanguagePageState extends State { if (state.currentLanguageType.value == lanType) { state.seletLocale = e; + AppLog.log( + 'e:$e lanType:$lanType state.currentLanguageType.value:${state.currentLanguageType.value} Get.locale!.languageCode:${Get.locale!.languageCode} Get.locale!.countryCode:${Get.locale!.countryCode}'); } l.add( CommonItem( diff --git a/lib/mine/mineMultiLanguage/mineMultiLanguage_state.dart b/lib/mine/mineMultiLanguage/mineMultiLanguage_state.dart index a91eba99..29396160 100755 --- a/lib/mine/mineMultiLanguage/mineMultiLanguage_state.dart +++ b/lib/mine/mineMultiLanguage/mineMultiLanguage_state.dart @@ -4,20 +4,21 @@ import 'package:star_lock/app_settings/app_settings.dart'; import '../../tools/store_service.dart'; import '../../translations/app_dept.dart'; +import '../../translations/current_locale_tool.dart'; class MineMultiLanguageState { - // MineMultiLanguageState() { - // resetLan(); - // } + MineMultiLanguageState() {} List get languages { return appDept.deptSupportedLocales; } - Rx currentLanguageType = - StoreService.to.getLanguageCode()!.isEmpty - ? LanguageType.system.obs - : ExtensionLanguageType.fromLocale(Get.locale!).obs; + Rx currentLanguageType = StoreService.to + .getLanguageCode()! + .isEmpty + ? LanguageType.system.obs + : ExtensionLanguageType.fromLocale(CurrentLocaleTool.getCurrentLocale()) + .obs; late Locale seletLocale; } diff --git a/lib/translations/current_locale_tool.dart b/lib/translations/current_locale_tool.dart index 10c79e49..07e485a8 100644 --- a/lib/translations/current_locale_tool.dart +++ b/lib/translations/current_locale_tool.dart @@ -8,18 +8,15 @@ import 'app_dept.dart'; class CurrentLocaleTool { /// 获取当前语言的Locale字符串,没有的话获取系统的 static String getCurrentLocaleString() { - final Locale locale = StoreService.to.getLanguageCode()!.isNotEmpty + final String languageCode = StoreService.to.getLanguageCode()!.isNotEmpty ? appDept.deptSupportedLocales .where((Locale element) => - element.languageCode.toString() == - getCurrentLocaleWithLanguageCode( - StoreService.to.getLanguageCode()!) - .languageCode) + element.toString() == StoreService.to.getLanguageCode()!) .first - : Get.deviceLocale!; // Get.deviceLocale; - final String languageCode = convertLocale(locale).toString(); - // AppLog.log( - // '11111locale.toString(): ${locale.toString()} locale: $locale languageCode:$languageCode 从本地获取code:${StoreService.to.getLanguageCode()}'); + .toString() + : convertLocale(Get.deviceLocale!).toString(); // Get.deviceLocale; + // final String languageCode = convertLocale(locale).toString(); + // AppLog.log('11111locale.toString(): ${locale.toString()} locale: $locale languageCode:$languageCode 从本地获取code:${StoreService.to.getLanguageCode()}'); return languageCode; } @@ -28,15 +25,12 @@ class CurrentLocaleTool { final Locale locale = StoreService.to.getLanguageCode()!.isNotEmpty ? appDept.deptSupportedLocales .where((Locale element) => - element.languageCode.toString() == - getCurrentLocaleWithLanguageCode( - StoreService.to.getLanguageCode()!) - .languageCode) + element.toString() == StoreService.to.getLanguageCode()!) .first : Get.deviceLocale!; // Get.deviceLocale; final Locale getLocale = convertLocale(locale); - // AppLog.log( - // '222locale.toString(): ${locale.toString()} locale: $locale getLocale:$getLocale 从本地获取code:${StoreService.to.getLanguageCode()}'); + AppLog.log( + '222locale.toString(): ${locale.toString()} locale: $locale getLocale:$getLocale 从本地获取code:${StoreService.to.getLanguageCode()}'); return getLocale; }