diff --git a/lib/mine/mineMultiLanguage/mineMultiLanguage_logic.dart b/lib/mine/mineMultiLanguage/mineMultiLanguage_logic.dart index c63773bb..a25ca1ef 100755 --- a/lib/mine/mineMultiLanguage/mineMultiLanguage_logic.dart +++ b/lib/mine/mineMultiLanguage/mineMultiLanguage_logic.dart @@ -33,9 +33,9 @@ class MineMultiLanguageLogic extends GetxController { } } - // Future changeLanguage(Locale l) async { - // await StoreService.to.saveLanguageCode(l.toString()); - // await Get.updateLocale(l); - // AppLog.log('saveLocale: ${l.toString()}}'); - // } +// Future changeLanguage(Locale l) async { +// await StoreService.to.saveLanguageCode(l.toString()); +// await Get.updateLocale(l); +// AppLog.log('saveLocale: ${l.toString()}}'); +// } } diff --git a/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart b/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart index a5a83f84..753ec6b0 100755 --- a/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart +++ b/lib/mine/mineMultiLanguage/mineMultiLanguage_page.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/mine/mineMultiLanguage/mineMultiLanguage_state.dart'; @@ -33,12 +34,17 @@ class _MineMultiLanguagePageState extends State { actionsList: [ TextButton( onPressed: () async { - await logic.updateUserLangInfo(state.seletLocale); - final String lanTypeTitle = - ExtensionLanguageType.fromLocale(state.seletLocale) - .lanTitle; - Get.back( - result: {'currentLanguage': state.seletLocale.toString()}); + await logic.updateUserLangInfo(state.seletLocale).then((value) { + final String lanTypeTitle = + ExtensionLanguageType.fromLocale(state.seletLocale) + .lanTitle; + Get.back(result: { + 'currentLanguage': state.seletLocale.toString() + }); + }).catchError((e) { + AppLog.log('updateUserLangInfo error:$e'); + EasyLoading.showToast('网络访问失败,请检查网络是否正常'.tr); + }); }, child: Text( '保存'.tr, diff --git a/lib/mine/mineSet/mineSet/mineSet_page.dart b/lib/mine/mineSet/mineSet/mineSet_page.dart index 7f639d2b..d7eeb3f6 100755 --- a/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -302,8 +302,11 @@ class _MineSetPageState extends State action: () async { // Get.toNamed(Routers.mineMultiLanguagePage); await Get.toNamed(Routers.mineMultiLanguagePage)!.then((value) { - state.currentLanguage.value = value['currentLanguage']; - setState(() {}); + setState(() { + if (value.containsKey('currentLanguage')) { + state.currentLanguage.value = value['currentLanguage']; + } + }); }); }), /* 2024-01-12 会议确定去掉“锁屏” by DaisyWu diff --git a/pubspec.lock b/pubspec.lock index dd6aba4d..20ab4d4b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -329,7 +329,7 @@ packages: source: hosted version: "0.3.4+2" crypto: - dependency: transitive + dependency: "direct main" description: name: crypto sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab