云天逵 7 mesi fa
parent
commit
3483444e01

+ 1 - 1
lib/data/repository/characters_repository.dart

@@ -184,7 +184,7 @@ class CharactersRepository {
         .deleteCustomCharacter(
           CharacterCustomDeleteRequest(characterId: characterId),
         )
-        .then(HttpHandler.handle(false));
+        .then(HttpHandler.handle(true));
   }
 
   // 获取新人人设列表

+ 3 - 1
lib/dialog/login/login_dialog_controller.dart

@@ -14,6 +14,7 @@ import 'package:keyboard/utils/toast_util.dart';
 import '../../data/consts/error_code.dart';
 import '../../handler/wechat_login_service.dart';
 import '../../resource/string.gen.dart';
+import '../../utils/error_handler.dart';
 import '../../utils/http_handler.dart';
 import '../member_agreement_dialog.dart';
 import '../privacy_agreement_dialog.dart';
@@ -64,7 +65,8 @@ class LoginDialogController extends BaseController {
                   ToastUtil.show(error.message);
                 }
               } else {
-                ToastUtil.show(StringName.loginFailedToast);
+                ErrorHandler.toastError(error);
+
               }
             });
       },

+ 5 - 3
lib/module/character/character_controller.dart

@@ -13,6 +13,7 @@ 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
@@ -23,10 +24,8 @@ class CharacterController extends BaseController
   final KeyboardRepository keyboardRepository;
   final AccountRepository accountRepository;
 
-
   Rxn<UserInfoResponse> get userInfo => accountRepository.userInfo;
 
-
   CharacterController(
     this.accountRepository,
     this.charactersRepository,
@@ -59,7 +58,10 @@ class CharacterController extends BaseController
       currentCharacterGroupInfo.value = characterGroupList.first;
     }
     if (keyboardInfoList.isNotEmpty) {
-      currentKeyboardInfo.value = keyboardInfoList.first;
+      currentKeyboardInfo.value = keyboardInfoList.firstWhere(
+        (element) => element.type == KeyboardType.system.name,
+        orElse: () => keyboardInfoList.first,
+      );
     }
 
     _dataLoad();

+ 6 - 0
lib/module/keyboard_manage/keyboard_manage_page.dart

@@ -478,6 +478,12 @@ class KeyboardManagePage extends BasePage<KeyboardManageController> {
           child: Container(
             width: 102.w,
             height: 38.h,
+            decoration: ShapeDecoration(
+              color: const Color(0xFFF5F4F9),
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(8.r),
+              ),
+            ),
             alignment: Alignment.center,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,

+ 6 - 1
lib/module/login/login_controller.dart

@@ -9,6 +9,7 @@ import '../../data/repository/account_repository.dart';
 import '../../dialog/privacy_agreement_dialog.dart';
 import '../../handler/wechat_login_service.dart';
 import '../../resource/string.gen.dart';
+import '../../utils/error_handler.dart';
 import '../../utils/http_handler.dart';
 import '../../utils/toast_util.dart';
 
@@ -130,11 +131,15 @@ class LoginController extends BaseController {
               ToastUtil.show(error.message);
             }
           } else {
-            ToastUtil.show(StringName.loginFailedToast);
+            ErrorHandler.toastError(error);
           }
         });
   }
 
+  void clickBack() {
+    Get.back();
+  }
+
   void _startCountDown() {
     Future.delayed(Duration(seconds: 1), () {
       int? time = _countDown.value;

+ 23 - 1
lib/module/login/login_page.dart

@@ -37,7 +37,9 @@ class LoginPage extends BasePage<LoginController> {
   Widget buildBody(BuildContext context) {
     return Stack(
       children: [
+
         Assets.images.bgLogin.image(fit: BoxFit.contain, width: 360.w),
+        _buildTitle(),
         SafeArea(
           child: Column(
             children: [
@@ -54,10 +56,30 @@ class LoginPage extends BasePage<LoginController> {
             ],
           ),
         ),
+
       ],
     );
   }
-
+  _buildTitle() {
+    return SafeArea(
+      child: Container(
+        alignment: Alignment.topLeft,
+        padding: EdgeInsets.only(top: 16.h, left: 16.w, right: 16.w),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            GestureDetector(
+              onTap: controller.clickBack,
+              child: Assets.images.iconStoreBack.image(
+                width: 32.w,
+                height: 32.w,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
   Widget buildPhoneTextFiled() {
     return Container(
       height: 48.w,

+ 16 - 22
lib/plugins/keyboard_method_handler.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/services.dart';
+
 import 'package:get/get.dart';
 import 'package:injectable/injectable.dart';
 import 'package:keyboard/data/repository/chat_repository.dart';
@@ -145,13 +146,7 @@ class KeyboardMethodHandler {
 
       return jsonEncode(chatSuperReplyResponse.toJson());
     } catch (error) {
-      if (error is ServerErrorException) {
-        AtmobLog.d(tag, "超会回失败: ${error.message}");
-        ToastUtil.show(error.message);
-      } else {
-        AtmobLog.d(tag, "超会回失败: $error");
-      }
-      return '{}';
+      return handleError(error);
     }
   }
 
@@ -170,13 +165,7 @@ class KeyboardMethodHandler {
           );
       return jsonEncode(chatSuperSpeakResponse.toJson());
     } catch (error) {
-      if (error is ServerErrorException) {
-        AtmobLog.d(tag, "超会说失败: ${error.message}");
-        ToastUtil.show(error.message);
-      } else {
-        AtmobLog.d(tag, "超会说失败: $error");
-      }
-      return '{}';
+      return handleError(error);
     }
   }
 
@@ -189,15 +178,10 @@ class KeyboardMethodHandler {
         name: name,
       );
       return jsonEncode(chatPrologueResponse.toJson());
-    } catch (error) {
-      if (error is ServerErrorException) {
-        ToastUtil.show(error.message);
-        AtmobLog.i(tag, "开场白失败: ${error.message}");
-      } else {
-        AtmobLog.i(tag, "开场白失败: $error");
-      }
-      return '{}';
+    }catch (error) {
+      return handleError(error);
     }
+
   }
 
   Future<String> _handleJumpAppPage(MethodCall call) async {
@@ -238,4 +222,14 @@ class KeyboardMethodHandler {
       return '{}';
     }
   }
+
+  String handleError(dynamic error) {
+    if (error is ServerErrorException) {
+      AtmobLog.e(tag, "接口请求失败: ${error.message}");
+      return jsonEncode({'code': error.code, 'message': error.message});
+    } else {
+      AtmobLog.e(tag, "未知异常: $error");
+      return jsonEncode({'code': -1, 'message': '$error'});
+    }
+  }
 }