From 42eb2aa49d350109ff717909514795f98fc76bf5 Mon Sep 17 00:00:00 2001
From: Ferry-200 <biyanci1@outlook.com>
Date: Tue, 3 Sep 2024 14:13:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E2=80=9C=E7=99=BB=E9=99=86=E2=80=9D?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=88=90=E2=80=9C=E7=99=BB=E5=BD=95=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 summer-ospp/2024/Flutter/maxkey_flutter/README.md      | 10 +++++-----
 .../2024/Flutter/maxkey_flutter/lib/l10n/app_zh.arb    |  6 +++---
 .../2024/Flutter/maxkey_flutter/lib/maxkey/maxkey.dart |  4 ++--
 .../lib/maxkey/services/authn.service.dart             |  4 ++--
 .../lib/maxkey/services/users.service.dart             |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/summer-ospp/2024/Flutter/maxkey_flutter/README.md b/summer-ospp/2024/Flutter/maxkey_flutter/README.md
index 7cbab5399..e488dfed2 100644
--- a/summer-ospp/2024/Flutter/maxkey_flutter/README.md
+++ b/summer-ospp/2024/Flutter/maxkey_flutter/README.md
@@ -4,8 +4,8 @@ MaxKey Flutter project.
 
 ### 待做：
 - [x] 账密登录
-- [x] 手机号登陆
-- [x] 保留登陆状态
+- [x] 手机号登录
+- [x] 保留登录状态
 - [x] 账号信息
 - [x] 扫码登录
 - [x] 登出
@@ -18,14 +18,14 @@ MaxKey Flutter project.
 - [x] 优化用户界面
 - [x] 多语言
 
-登陆页：
+登录页：
 - MaxKey LOGO
 - 用户名、密码、验证码
-- 登陆
+- 登录
 - 设置
 
 主页面：
-- 用户卡片（包括扫码登陆按钮）
+- 用户卡片（包括扫码登录按钮）
 - 添加 TOTP 按钮
 - TOTP 列表（可删除某个 TOTP）
 
diff --git a/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_zh.arb b/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_zh.arb
index 69e375864..7420094e9 100644
--- a/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_zh.arb
+++ b/summer-ospp/2024/Flutter/maxkey_flutter/lib/l10n/app_zh.arb
@@ -12,8 +12,8 @@
     "homePageUserCardGreetingNoon": "中午好",
     "homePageUserCardGreetingAfternoon": "下午好",
     "homePageUserCardGreetingEvening": "晚上好",
-    "homePageUserCardScanPage": "扫码登陆",
-    "homePageUserCardScanSucceed": "登陆成功",
+    "homePageUserCardScanPage": "扫码登录",
+    "homePageUserCardScanSucceed": "登录成功",
 
     "loginPageSettingBtn": "设置",
     "loginPageLoginViewUsername": "用户名",
@@ -39,7 +39,7 @@
 
     "userPageFullUserInfoDialogTitle": "详细信息",
     "userPageFullUserInfoDialogDisplayName": "姓名",
-    "userPageFullUserInfoDialogUsername": "登陆账号",
+    "userPageFullUserInfoDialogUsername": "登录账号",
     "userPageFullUserInfoDialogGender": "性别",
     "userPageFullUserInfoDialogEmployeeNumber": "员工编号",
     "userPageFullUserInfoDialogMobile": "手机号码",
diff --git a/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/maxkey.dart b/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/maxkey.dart
index c8978bd84..303dff7e3 100644
--- a/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/maxkey.dart
+++ b/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/maxkey.dart
@@ -43,9 +43,9 @@ class MaxKey with ChangeNotifier {
         if (error.type == DioExceptionType.badResponse) {
           SCAFFOLD_MESSENGER_KEY.currentState?.showSnackBar(
             SnackBar(
-              content: const Text("登陆状态过期。请重新登陆"),
+              content: const Text("登录状态过期。请重新登录"),
               action: SnackBarAction(
-                label: "重新登陆",
+                label: "重新登录",
                 onPressed: () async {
                   _dio.options.headers.remove(HttpHeaders.authorizationHeader);
                   await MaxKeyPersistent.instance.clearToken();
diff --git a/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/services/authn.service.dart b/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/services/authn.service.dart
index 588261e42..03b69baba 100644
--- a/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/services/authn.service.dart
+++ b/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/services/authn.service.dart
@@ -83,7 +83,7 @@ class AuthnService {
       );
 
       if (res.data["code"] != 0) {
-        final msg = res.data["message"] ?? "登陆失败";
+        final msg = res.data["message"] ?? "登录失败";
         expectedErrorHandler(msg);
         LOGGER.w(msg);
         return false;
@@ -122,7 +122,7 @@ class AuthnService {
       );
 
       if (res.data["code"] != 0) {
-        final msg = res.data["message"] ?? "扫码登陆失败";
+        final msg = res.data["message"] ?? "扫码登录失败";
         expectedErrorHandler(msg);
         LOGGER.w(msg);
         return false;
diff --git a/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/services/users.service.dart b/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/services/users.service.dart
index e5394bb7b..7a5013763 100644
--- a/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/services/users.service.dart
+++ b/summer-ospp/2024/Flutter/maxkey_flutter/lib/maxkey/services/users.service.dart
@@ -22,7 +22,7 @@ class MaxKeyUserInfo {
     /// 姓名
     required this.displayName,
 
-    /// 登陆账号
+    /// 登录账号
     required this.username,
 
     /// 性别
@@ -146,7 +146,7 @@ class MaxKeyUserInfo {
   /// 姓名
   final String displayName;
 
-  /// 登陆账号
+  /// 登录账号
   final String username;
 
   /// 性别