Merge branch 'v1.0.0' of http://git.atmob.com:28999/Atmob-Flutter/AiKeyboard2025 into v1.0.0

lib/base/base_controller.dart

@@ -21,7 +21,7 @@ class BaseController extends GetxController {
   @override
   void onClose() {
     debugPrint('BaseController $runtimeType onClose');
-    super.onReady();
+    super.onClose();
   }
   void _initParameters() {
     var getParameters = Get.parameters;

lib/data/repository/keyboard_repository.dart

@@ -65,14 +65,15 @@ class KeyboardRepository {
     _homeLoveIndex.value = null;
     await Future.delayed(const Duration(milliseconds: 500));
     // 延迟为了保证首页数据能够正常获取，不然保存的时候，获取太快了，导致还是拉到旧的数值
-    refreshKeyboardList();
     refreshUserInfo();
-    refreshLoveIndex();
+    await Future.delayed(const Duration(milliseconds: 300));
     getKeyboardHomeInfo();
-    getKeyboardLoveIndex();
+    // 注销登录后，重新获取键盘列表。过快拉取服务端会直接返回空数据，导致人设页数据没有通用键盘
+    await Future.delayed(const Duration(milliseconds: 300));
+    refreshKeyboardList();
+    refreshLoveIndex();
   }
 
-
   void refreshUserInfo() async {
     homeInfoFuture?.cancel();
     homeInfoFuture = AsyncUtil.retryWithExponentialBackoff(

lib/main.dart

@@ -133,6 +133,7 @@ class MyApp extends StatelessWidget {
         builder: AppCommonConfig.builder,
         translations: AppCommonConfig.localizationsTranslations,
         localizationsDelegates: AppCommonConfig.localizations.delegates,
+        supportedLocales: AppCommonConfig.localizations.supportedLocales,
         locale: AppCommonConfig.localizations.locale,
         fallbackLocale: AppCommonConfig.localizations.fallbackLocale,
       ),

lib/module/character/character_controller.dart

@@ -13,7 +13,6 @@ import '../../data/bean/character_group_info.dart';
 import '../../data/repository/characters_repository.dart';
 import '../../data/repository/keyboard_repository.dart';
 import '../character_custom/character_custom_page.dart';
-import '../keyboard_manage/keyboard_manage_controller.dart';
 
 @injectable
 class CharacterController extends BaseController
@@ -38,7 +37,7 @@ class CharacterController extends BaseController
       charactersRepository.characterGroupList;
 
   // 键盘列表
-  List<KeyboardInfo> get keyboardInfoList =>
+  RxList<KeyboardInfo> get keyboardInfoList =>
       keyboardRepository.keyboardInfoList;
 
   late Rx<TabController> tabController;
@@ -94,8 +93,8 @@ class CharacterController extends BaseController
       }
     });
 
-    ever(keyboardRepository.keyboardInfoList, (value) {
-      AtmobLog.d(tag, "keyboardInfoList1 changed");
+    ever(keyboardInfoList, (value) {
+      AtmobLog.d(tag, "keyboardInfoList1 changed ${keyboardInfoList.length}");
       if (value.isNotEmpty) {
         currentKeyboardInfo.value = keyboardInfoList.first;
         print("currentKeyboardInfo.value: ${currentKeyboardInfo.value}");

lib/module/intro/intro_page.dart

@@ -26,6 +26,7 @@ class IntroPage extends BasePage<IntroController> {
   @override
   Widget buildBody(BuildContext context) {
     return PopScope(
+      canPop: false,
       onPopInvokedWithResult: (didPop, result) async {
         if (didPop) {
           return;

lib/module/new_user/result/new_user_result_controller.dart

@@ -94,7 +94,7 @@ class NewUserResultController extends BaseController {
             '$tag keyboardCharacterUpdate success ${characterIds.toList()}',
           );
           AtmobLog.d(tag, "更新键盘人设成功");
-          ToastUtil.show(StringName.keyboardSaveSuccess);
+
           MainPage.start();
         })
         .catchError((error) {

lib/module/profile/profile_controller.dart

@@ -106,6 +106,8 @@ class ProfileController extends BaseController {
           AtmobLog.d(tag, " $error");
         }
       }
+    }else {
+      ToastUtil.show("请选择档案~");
     }
   }