首页欢迎文本

packages/cpt_main/lib/modules/home/home_page.dart

@@ -8,6 +8,7 @@ import 'package:flutter/src/widgets/framework.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:auto_route/auto_route.dart';
+import 'package:plugin_basic/provider/user_config/user_config_service.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:router/componentRouter/community_service.dart';
 import 'package:router/componentRouter/component_service_manager.dart';
@@ -47,7 +48,8 @@ class HomePage extends HookConsumerWidget {
     }, []);
 
     return Scaffold(
-      appBar: MyAppBar.appBar(context, "Good Afternoon,Mike",
+      //根据当前时间生成欢迎文本
+      appBar: MyAppBar.appBar(context, _formatNowGreetingText(ref),
           showBackButton: false,
           backgroundColor: context.appColors.backgroundWhite,
           actions: [
@@ -470,4 +472,19 @@ class HomePage extends HookConsumerWidget {
       ],
     ).paddingOnly(left: 15, right: 15));
   }
+
+  /// 根据现在的小时数，返回 早上好，中午好，下午好，晚上好 这四个字符串
+  String _formatNowGreetingText(WidgetRef ref) {
+    final now = DateTime.now();
+    final hour = now.hour;
+    String greeting;
+    if (hour < 12) {
+      greeting = S.current.good_morning(UserConfigService.getState(ref: ref).userName ?? "-");
+    } else if (hour < 18) {
+      greeting = S.current.good_afternoon(UserConfigService.getState(ref: ref).userName ?? "-");
+    } else {
+      greeting = S.current.good_evening(UserConfigService.getState(ref: ref).userName ?? "-");
+    }
+    return greeting;
+  }
 }

packages/cs_resources/lib/generated/intl/messages_en.dart

@@ -26,16 +26,22 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static String m2(count) => "${count} Characters";
 
-  static String m3(time) => "Not Approved on ${time}";
+  static String m3(name) => "Good Afternoon,${name}";
 
-  static String m4(count, date) =>
+  static String m4(name) => "Good Evening,${name}";
+
+  static String m5(name) => "Good Morning,${name}";
+
+  static String m6(time) => "Not Approved on ${time}";
+
+  static String m7(count, date) =>
       "You have ${count}x quota left (resets on ${date})";
 
-  static String m5(time) => "Sent on ${time}";
+  static String m8(time) => "Sent on ${time}";
 
-  static String m6(name) => "Thank you ${name}";
+  static String m9(name) => "Thank you ${name}";
 
-  static String m7(name) => "Welcome ${name}";
+  static String m10(name) => "Welcome ${name}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -182,6 +188,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("let\'s get started"),
         "get_verification_code":
             MessageLookupByLibrary.simpleMessage("Get Verification Code"),
+        "good_afternoon": m3,
+        "good_evening": m4,
+        "good_morning": m5,
         "gourmet_pavilion":
             MessageLookupByLibrary.simpleMessage("Gourmet Pavilion"),
         "guest_mobile_number":
@@ -263,7 +272,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "next": MessageLookupByLibrary.simpleMessage("Next"),
         "no": MessageLookupByLibrary.simpleMessage("No"),
         "not_approved": MessageLookupByLibrary.simpleMessage("Not Approved"),
-        "not_approved_on_sometime": m3,
+        "not_approved_on_sometime": m6,
         "notes": MessageLookupByLibrary.simpleMessage("Notes"),
         "notes_to_management":
             MessageLookupByLibrary.simpleMessage("NOTES TO MANAGEMENT"),
@@ -331,7 +340,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Your feedback has been successfully sent! We will reply to you as soon as possible! thank you!"),
         "published_successfully":
             MessageLookupByLibrary.simpleMessage("Published Successfully"),
-        "quota_left_msg": m4,
+        "quota_left_msg": m7,
         "rate_us": MessageLookupByLibrary.simpleMessage("Rate Us"),
         "re_registration_of_1_vehicle_owner":
             MessageLookupByLibrary.simpleMessage(
@@ -370,7 +379,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "send_feedback": MessageLookupByLibrary.simpleMessage("Send FeedBack"),
         "send_feedback_management": MessageLookupByLibrary.simpleMessage(
             "If you would like more information,please send a feedback to the Management"),
-        "send_on_sometime": m5,
+        "send_on_sometime": m8,
         "send_sms_successful": MessageLookupByLibrary.simpleMessage(
             "Sending SMS successfully, please enter SMS verification code"),
         "sent": MessageLookupByLibrary.simpleMessage("Sent"),
@@ -420,7 +429,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Terms & Conditions"),
         "terms_of_service":
             MessageLookupByLibrary.simpleMessage("Terms of Service"),
-        "thank_you_name": m6,
+        "thank_you_name": m9,
         "time_of_arrival":
             MessageLookupByLibrary.simpleMessage("TIME OF ARRIVAL"),
         "title": MessageLookupByLibrary.simpleMessage("Title"),
@@ -464,7 +473,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Visitor Registration"),
         "waiting_for_the_administrator": MessageLookupByLibrary.simpleMessage(
             "Waiting for the administrator"),
-        "welcome_name": m7,
+        "welcome_name": m10,
         "who_are_owners":
             MessageLookupByLibrary.simpleMessage("Who are owners?"),
         "who_are_tenants":

packages/cs_resources/lib/generated/l10n.dart

@@ -2870,6 +2870,36 @@ class S {
     );
   }
 
+  /// `Good Evening,{name}`
+  String good_evening(Object name) {
+    return Intl.message(
+      'Good Evening,$name',
+      name: 'good_evening',
+      desc: '',
+      args: [name],
+    );
+  }
+
+  /// `Good Afternoon,{name}`
+  String good_afternoon(Object name) {
+    return Intl.message(
+      'Good Afternoon,$name',
+      name: 'good_afternoon',
+      desc: '',
+      args: [name],
+    );
+  }
+
+  /// `Good Morning,{name}`
+  String good_morning(Object name) {
+    return Intl.message(
+      'Good Morning,$name',
+      name: 'good_morning',
+      desc: '',
+      args: [name],
+    );
+  }
+
   /// `Notice`
   String get notice {
     return Intl.message(

packages/cs_resources/lib/l10n/intl_en.arb

@@ -281,6 +281,9 @@
   "manage": "Manage",
   "parking_fee_payment": "Parking Fee Payment",
   "property_payment": "Property Payment",
+  "good_evening": "Good Evening,{name}",
+  "good_afternoon": "Good Afternoon,{name}",
+  "good_morning": "Good Morning,{name}",
   "notice": "Notice",
   "other": "Other"
 }

packages/cs_resources/lib/l10n/intl_zh_CN.arb

@@ -281,6 +281,9 @@
   "manage": "管理",
   "parking_fee_payment": "停车费",
   "property_payment": "物业费",
+  "good_evening": "晚上好，{name}",
+  "good_afternoon": "下午好，{name}",
+  "good_morning": "早上好，{name}",
   "notice": "公告",
   "other": "其他"
 }

packages/cs_resources/lib/l10n/intl_zh_HK.arb

@@ -267,6 +267,9 @@
   "manage": "管理",
   "parking_fee_payment": "停车费",
   "property_payment": "物业费",
+  "good_evening": "晚上好，{name}",
+  "good_afternoon": "下午好，{name}",
+  "good_morning": "早上好，{name}",
   "notice": "公告",
   "other": "其他"
 }

packages/cs_shared/lib/utils/util.dart

@@ -117,25 +117,6 @@ class Utils {
     };
   }
 
-  /// 根据现在的小时数，返回 早上好，中午好，下午好，晚上好 这四个字符串
-  static String formatNowGreetingText() {
-    final now = DateTime.now();
-    final hour = now.hour;
-    String greeting;
-    if (hour < 11) {
-      greeting = '早上好';
-    } else if (hour < 13) {
-      greeting = '中午好';
-    } else if (hour < 18) {
-      greeting = '下午好';
-    } else if (hour < 24) {
-      greeting = '晚上好';
-    } else {
-      greeting = '早上好';
-    }
-    return greeting;
-  }
-
   /// 将时间转化为 多久之前
   static String getTimeAgo(String? dateTimeStr) {
     if (dateTimeStr == null || dateTimeStr.isEmpty) {