Browse Source

update community

glglove 3 months ago
parent
commit
5a3cde8ab3
70 changed files with 400 additions and 826 deletions
  1. 6 2
      packages/cpt_community/lib/modules/community/community_page.dart
  2. 1 1
      packages/cpt_community/lib/modules/community/newsfeed_detail/newsfeed_detail_page.dart
  3. 1 1
      packages/cpt_community/lib/modules/community/newsfeed_post/newsfeed_post_page.dart
  4. 1 1
      packages/cpt_community/lib/modules/garage/garagesale_detail/garagesale_detail_page.dart
  5. 1 1
      packages/cpt_community/lib/modules/garage/garagesale_post/garagesale_post_page.dart
  6. 1 1
      packages/cpt_community/lib/modules/my_following/my_following_page.dart
  7. 1 1
      packages/cpt_community/lib/modules/my_posts/my_posts_page.dart
  8. 1 1
      packages/cpt_facility/lib/modules/book_confirm/book_confirm_page.dart
  9. 1 1
      packages/cpt_facility/lib/modules/booking/facility_booking_page.dart
  10. 1 1
      packages/cpt_facility/lib/modules/detail/facility_detail_page.dart
  11. 1 1
      packages/cpt_facility/lib/modules/facility/facility_page.dart
  12. 1 1
      packages/cpt_facility/lib/modules/location/facility_location_page.dart
  13. 1 1
      packages/cpt_form/lib/modules/apply/attachment_page.dart
  14. 1 1
      packages/cpt_form/lib/modules/apply/form_payment_page.dart
  15. 1 1
      packages/cpt_form/lib/modules/apply/guest_vehicle_page.dart
  16. 1 1
      packages/cpt_form/lib/modules/apply/large_text_box_page.dart
  17. 1 1
      packages/cpt_form/lib/modules/apply/moving_company_page.dart
  18. 1 1
      packages/cpt_form/lib/modules/apply/moving_date_page.dart
  19. 1 1
      packages/cpt_form/lib/modules/apply/note_management_page.dart
  20. 1 1
      packages/cpt_form/lib/modules/apply/renovation_company_page.dart
  21. 1 1
      packages/cpt_form/lib/modules/apply/renovation_date_page.dart
  22. 1 1
      packages/cpt_form/lib/modules/apply/signature_page.dart
  23. 1 1
      packages/cpt_form/lib/modules/apply/type_of_application_page.dart
  24. 1 1
      packages/cpt_form/lib/modules/apply/vehicle_info_page.dart
  25. 1 1
      packages/cpt_form/lib/modules/detail/form_detail_page.dart
  26. 1 1
      packages/cpt_form/lib/modules/form/form_page.dart
  27. 1 1
      packages/cpt_main/lib/modules/feedback/create/feedback_create_page.dart
  28. 1 1
      packages/cpt_main/lib/modules/feedback/create_success/feedback_create_success_page.dart
  29. 1 1
      packages/cpt_main/lib/modules/feedback/feedback_page.dart
  30. 1 1
      packages/cpt_main/lib/modules/home/home_page.dart
  31. 1 1
      packages/cpt_main/lib/modules/home/latest_news/latest_news_page.dart
  32. 1 1
      packages/cpt_main/lib/modules/home/management_guides/management_guides_page.dart
  33. 1 1
      packages/cpt_main/lib/modules/home/property_news/home_property_news_page.dart
  34. 1 1
      packages/cpt_main/lib/modules/main/main_page.dart
  35. 3 2
      packages/cpt_main/lib/modules/me/me_page.dart
  36. 2 2
      packages/cpt_main/lib/modules/notification/notification_page.dart
  37. 1 1
      packages/cpt_main/lib/modules/visitor/register/visitor_register_page.dart
  38. 1 1
      packages/cpt_main/lib/modules/visitor/visitor_page.dart
  39. 1 1
      packages/cpt_notice_board/lib/modules/announcement_detail/page/announcement_detail_page.dart
  40. 1 1
      packages/cpt_notice_board/lib/modules/documents_list/page/documents_list_page.dart
  41. 1 1
      packages/cpt_notice_board/lib/modules/event_detail/page/event_detail_page.dart
  42. 1 1
      packages/cpt_notice_board/lib/modules/notice_board/page/notice_board_page.dart
  43. 1 1
      packages/cpt_payment/lib/modules/add_card/add_card_page.dart
  44. 1 1
      packages/cpt_payment/lib/modules/choose_card/choose_card_page.dart
  45. 1 1
      packages/cpt_payment/lib/modules/payment/payment_page.dart
  46. 1 1
      packages/cpt_payment/lib/modules/payment_confirm/payment_confirm_page.dart
  47. 1 1
      packages/cpt_payment/lib/modules/payment_info/payment_info_page.dart
  48. 1 1
      packages/cpt_payment/lib/modules/payment_success/payment_success_page.dart
  49. 6 37
      packages/cpt_profile/lib/modules/change_mobile/change_mobile_page.dart
  50. 0 7
      packages/cpt_profile/lib/modules/change_mobile/change_mobile_state.dart
  51. 22 53
      packages/cpt_profile/lib/modules/change_mobile/change_mobile_view_model.dart
  52. 70 61
      packages/cpt_profile/lib/modules/my_estate/item_estate.dart
  53. 1 1
      packages/cpt_profile/lib/modules/my_estate/my_estate_page.dart
  54. 1 1
      packages/cpt_profile/lib/modules/my_household/my_household_page.dart
  55. 1 1
      packages/cpt_profile/lib/modules/profile_edit/Profile_edit_page.dart
  56. 1 1
      packages/cpt_profile/lib/modules/setting/setting_page.dart
  57. 1 1
      packages/cpt_property/lib/modules/property/page/property_page.dart
  58. 1 1
      packages/cpt_services/lib/modules/services/services_page.dart
  59. BIN
      packages/cs_resources/assets/profile/my_estate_default.webp
  60. 1 0
      packages/cs_resources/lib/generated/assets.dart
  61. 3 0
      packages/cs_resources/lib/generated/intl/messages_en.dart
  62. 1 313
      packages/cs_resources/lib/generated/intl/messages_zh_CN.dart
  63. 1 296
      packages/cs_resources/lib/generated/intl/messages_zh_HK.dart
  64. 30 0
      packages/cs_resources/lib/generated/l10n.dart
  65. 3 0
      packages/cs_resources/lib/l10n/intl_en.arb
  66. 3 0
      packages/cs_resources/lib/l10n/intl_zh_CN.arb
  67. 3 0
      packages/cs_resources/lib/l10n/intl_zh_HK.arb
  68. 12 1
      packages/cs_resources/lib/theme/app_colors_theme.dart
  69. 181 0
      packages/cs_widgets/lib/dialog/verify_code_dialog.dart
  70. 2 1
      packages/cs_widgets/lib/widget_export.dart

+ 6 - 2
packages/cpt_community/lib/modules/community/community_page.dart

@@ -60,7 +60,11 @@ class CommunityPage extends HookConsumerWidget {
         },[tabsRouterKey.currentState?.controller]);
 
         return Scaffold(
-            appBar: MyAppBar.searchAppBar(
+            appBar: state.currentCategoryIdx == 0 ? MyAppBar.appBar(
+              context,
+              "Community",
+              backgroundColor: context.appColors.backgroundWhite,
+            ): MyAppBar.searchAppBar(
               context,
               actions: [
                  const MyAssetImage(
@@ -81,7 +85,7 @@ class CommunityPage extends HookConsumerWidget {
                   }) : const SizedBox.shrink(),
                 const SizedBox(width: 15),
               ],
-              backgroundColor: context.appColors.whiteBG,
+              backgroundColor: context.appColors.backgroundWhite,
             ),
           backgroundColor: context.appColors.backgroundDefault,
           body: AutoTabsRouter.pageView(

+ 1 - 1
packages/cpt_community/lib/modules/community/newsfeed_detail/newsfeed_detail_page.dart

@@ -57,7 +57,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         "News Feed Detail",
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: ColorUtils.string2Color("#F2F3F6"),
       body: Column(

+ 1 - 1
packages/cpt_community/lib/modules/community/newsfeed_post/newsfeed_post_page.dart

@@ -37,7 +37,7 @@ class NewsfeedPostPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         "Create Post",
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: ColorUtils.string2Color("#F2F3F6"),
       body: Column(

+ 1 - 1
packages/cpt_community/lib/modules/garage/garagesale_detail/garagesale_detail_page.dart

@@ -47,7 +47,7 @@ class GaragesaleDetailPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         pageTitle,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDefault,
       body: Column(

+ 1 - 1
packages/cpt_community/lib/modules/garage/garagesale_post/garagesale_post_page.dart

@@ -42,7 +42,7 @@ class GaragesalePostPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         "Post New Item",
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: Colors.white,
       body: Column(

+ 1 - 1
packages/cpt_community/lib/modules/my_following/my_following_page.dart

@@ -85,7 +85,7 @@ class MyFollowingPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         myFollowingPageTabsRouterKey.currentState?.controller!.activeIndex == 0 ? "My Follow" : "My Follower",
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: ColorUtils.string2Color("#F2F3F6"),
       body: Column(

+ 1 - 1
packages/cpt_community/lib/modules/my_posts/my_posts_page.dart

@@ -58,7 +58,7 @@ class MyPostsPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         "My Posts",
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDefault,
       body: Column(

+ 1 - 1
packages/cpt_facility/lib/modules/book_confirm/book_confirm_page.dart

@@ -36,7 +36,7 @@ class BookConfirmPage extends HookConsumerWidget {
         context,
         "Function Room",
         showBackButton: true,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: Column(

+ 1 - 1
packages/cpt_facility/lib/modules/booking/facility_booking_page.dart

@@ -50,7 +50,7 @@ class FacilityBookingPage extends HookConsumerWidget {
     }, []);
 
     return Scaffold(
-      appBar: MyAppBar.appBar(context, "Kids party room", backgroundColor: context.appColors.whiteBG, actions: [
+      appBar: MyAppBar.appBar(context, "Kids party room", backgroundColor: context.appColors.backgroundWhite, actions: [
         //去设施小区的定位图片
         const MyAssetImage(
           Assets.facilityTitleLocationIcon,

+ 1 - 1
packages/cpt_facility/lib/modules/detail/facility_detail_page.dart

@@ -41,7 +41,7 @@ class FacilityDetailPage extends HookConsumerWidget {
     final state = ref.watch(facilityDetailViewModelProvider);
 
     return Scaffold(
-      appBar: MyAppBar.appBar(context, "Kids party room", backgroundColor: context.appColors.whiteBG),
+      appBar: MyAppBar.appBar(context, "Kids party room", backgroundColor: context.appColors.backgroundWhite),
       backgroundColor: context.appColors.backgroundDark,
       body: SingleChildScrollView(
         scrollDirection: Axis.vertical,

+ 1 - 1
packages/cpt_facility/lib/modules/facility/facility_page.dart

@@ -34,7 +34,7 @@ class FacilityPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         S.current.facility,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: AutoTabsRouter.pageView(

+ 1 - 1
packages/cpt_facility/lib/modules/location/facility_location_page.dart

@@ -43,7 +43,7 @@ class FacilityLocationPage extends HookConsumerWidget {
         context,
         "Kids party room",
       ),
-      backgroundColor: context.appColors.whiteBG,
+      backgroundColor: context.appColors.backgroundWhite,
       body: Container(
         width: double.infinity,
         height: double.infinity,

+ 1 - 1
packages/cpt_form/lib/modules/apply/attachment_page.dart

@@ -45,7 +45,7 @@ class AttachmentPage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/form_payment_page.dart

@@ -54,7 +54,7 @@ class FormPaymentPage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/guest_vehicle_page.dart

@@ -65,7 +65,7 @@ class GuestVehiclePage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/large_text_box_page.dart

@@ -50,7 +50,7 @@ class LargeTextBoxPage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/moving_company_page.dart

@@ -65,7 +65,7 @@ class MovingCompanyPage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/moving_date_page.dart

@@ -44,7 +44,7 @@ class MovingDatePage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/note_management_page.dart

@@ -50,7 +50,7 @@ class NoteManagementPage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/renovation_company_page.dart

@@ -64,7 +64,7 @@ class RenovationCompanyPage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/renovation_date_page.dart

@@ -45,7 +45,7 @@ class RenovationDatePage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/signature_page.dart

@@ -52,7 +52,7 @@ class SignaturePage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/type_of_application_page.dart

@@ -34,7 +34,7 @@ class TypeOfApplicationPage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/apply/vehicle_info_page.dart

@@ -64,7 +64,7 @@ class VehicleInfoPage extends HookConsumerWidget {
     return WillPopScope(
         child: Scaffold(
             appBar: MyAppBar.appBar(context, state.applyDetail?['title']),
-            backgroundColor: context.appColors.whiteBG,
+            backgroundColor: context.appColors.backgroundWhite,
             body: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [

+ 1 - 1
packages/cpt_form/lib/modules/detail/form_detail_page.dart

@@ -53,7 +53,7 @@ class FormDetailPage extends HookConsumerWidget {
     }, []);
 
     return Scaffold(
-      appBar: MyAppBar.appBar(context, FormTypes.iconMap[type]?['name'] ?? "", backgroundColor: context.appColors.whiteBG),
+      appBar: MyAppBar.appBar(context, FormTypes.iconMap[type]?['name'] ?? "", backgroundColor: context.appColors.backgroundWhite),
       backgroundColor: context.appColors.backgroundDark,
       body: SizedBox(
         width: double.infinity,

+ 1 - 1
packages/cpt_form/lib/modules/form/form_page.dart

@@ -34,7 +34,7 @@ class FormPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         S.current.form,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: AutoTabsRouter.pageView(

+ 1 - 1
packages/cpt_main/lib/modules/feedback/create/feedback_create_page.dart

@@ -39,7 +39,7 @@ class FeedbackCreatePage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: MyAppBar.appBar(context, S.current.create_new_feedback),
-      backgroundColor: context.appColors.whiteBG,
+      backgroundColor: context.appColors.backgroundWhite,
       body: SingleChildScrollView(
         scrollDirection: Axis.vertical,
         physics: const BouncingScrollPhysics(),

+ 1 - 1
packages/cpt_main/lib/modules/feedback/create_success/feedback_create_success_page.dart

@@ -32,7 +32,7 @@ class FeedbackCreateSuccessPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     return Scaffold(
       appBar: MyAppBar.appBar(context, S.current.published_successfully),
-      backgroundColor: context.appColors.whiteBG,
+      backgroundColor: context.appColors.backgroundWhite,
       body: Column(
         children: [
           Column(

+ 1 - 1
packages/cpt_main/lib/modules/feedback/feedback_page.dart

@@ -21,7 +21,7 @@ class FeedbackPage extends StatelessWidget {
         context,
         S.current.feedback,
         showBackButton: false,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: AutoTabsRouter.pageView(

+ 1 - 1
packages/cpt_main/lib/modules/home/home_page.dart

@@ -36,7 +36,7 @@ class HomePage extends HookConsumerWidget {
           backIconWidth: 18.5,
           backIconHeight: 20,
           showBackButton: true,
-          backgroundColor: context.appColors.whiteBG,
+          backgroundColor: context.appColors.backgroundWhite,
           backCallback: (){
           ToastEngine.show("测试去登录页面");
           ComponentServiceManager().authService.startLoginPage();

+ 1 - 1
packages/cpt_main/lib/modules/home/latest_news/latest_news_page.dart

@@ -29,7 +29,7 @@ class LatestNewsPage extends StatelessWidget {
       appBar: MyAppBar.appBar(
         context,
         S.current.latest_news,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: AutoTabsRouter.pageView(

+ 1 - 1
packages/cpt_main/lib/modules/home/management_guides/management_guides_page.dart

@@ -39,7 +39,7 @@ class ManagementGuidesPage extends HookConsumerWidget {
     }, []);
 
     return Scaffold(
-      appBar: MyAppBar.appBar(context, S.current.strata_management_guides, backgroundColor: context.appColors.whiteBG),
+      appBar: MyAppBar.appBar(context, S.current.strata_management_guides, backgroundColor: context.appColors.backgroundWhite),
       backgroundColor: context.appColors.backgroundDefault,
       body: Container(
         width: double.infinity,

+ 1 - 1
packages/cpt_main/lib/modules/home/property_news/home_property_news_page.dart

@@ -40,7 +40,7 @@ class HomePropertyNewsPage extends HookConsumerWidget {
     }, []);
 
     return Scaffold(
-      appBar: MyAppBar.appBar(context, S.current.property_news, backgroundColor: context.appColors.whiteBG),
+      appBar: MyAppBar.appBar(context, S.current.property_news, backgroundColor: context.appColors.backgroundWhite),
       backgroundColor: context.appColors.backgroundDark,
       body: Container(
         width: double.infinity,

+ 1 - 1
packages/cpt_main/lib/modules/main/main_page.dart

@@ -91,7 +91,7 @@ class MainPage extends HookConsumerWidget {
       bottomNavigationBuilder: (context, tabsRouter) {
         return BottomNavigationBar(
           elevation: 10,
-          backgroundColor: context.appColors.whiteBG,
+          backgroundColor: context.appColors.backgroundWhite,
           type: BottomNavigationBarType.fixed,
           currentIndex: tabsRouter.activeIndex,
           onTap: tabsRouter.setActiveIndex,

+ 3 - 2
packages/cpt_main/lib/modules/me/me_page.dart

@@ -28,7 +28,9 @@ class MePage extends HookConsumerWidget {
         "",
         showBackButton: false,
         backgroundColor: context.appColors.btnBgDefault,
-        systemUiOverlayStyle: ThemeConfig.systemUiOverlayStyleLightThemeWhite,
+        systemUiOverlayStyle: MediaQuery.of(context).platformBrightness == Brightness.dark
+            ? ThemeConfig.systemUiOverlayStyleDarkTheme
+            : ThemeConfig.systemUiOverlayStyleLightThemeWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: SingleChildScrollView(
@@ -91,7 +93,6 @@ class MePage extends HookConsumerWidget {
                 iconPath: Assets.mainMeSettingIcon,
                 isShowMoreIcon: true,
               ).onTap(viewModel.gotoSettingPage),
-
             ],
           ),
         ),

+ 2 - 2
packages/cpt_main/lib/modules/notification/notification_page.dart

@@ -42,7 +42,7 @@ class NotificationPage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: MyAppBar.appBar(context, S.current.notification,
-          backgroundColor: context.appColors.whiteBG,
+          backgroundColor: context.appColors.backgroundWhite,
           actions: [
             Center(
                 child: MyTextView(
@@ -55,7 +55,7 @@ class NotificationPage extends HookConsumerWidget {
             )),
           ],
           showBottomDivider: false),
-      backgroundColor: context.appColors.whiteBG,
+      backgroundColor: context.appColors.backgroundWhite,
       body: SizedBox(
         width: double.infinity,
         height: double.infinity,

+ 1 - 1
packages/cpt_main/lib/modules/visitor/register/visitor_register_page.dart

@@ -43,7 +43,7 @@ class VisitorRegisterPage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: MyAppBar.appBar(context, S.current.visitor_registration),
-      backgroundColor: context.appColors.whiteBG,
+      backgroundColor: context.appColors.backgroundWhite,
       body: SingleChildScrollView(
         scrollDirection: Axis.vertical,
         physics: const BouncingScrollPhysics(),

+ 1 - 1
packages/cpt_main/lib/modules/visitor/visitor_page.dart

@@ -26,7 +26,7 @@ class VisitorPage extends HookConsumerWidget {
         context,
         S.current.visitor,
         showBackButton: false,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: AutoTabsRouter.pageView(

+ 1 - 1
packages/cpt_notice_board/lib/modules/announcement_detail/page/announcement_detail_page.dart

@@ -153,7 +153,7 @@ class AnnouncementDetailPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         "Lift Padding",
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       body: Container(
           child: EasyRefresh(

+ 1 - 1
packages/cpt_notice_board/lib/modules/documents_list/page/documents_list_page.dart

@@ -130,7 +130,7 @@ class DocumentsListPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         "Documents",
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       body: Container(
           child: EasyRefresh(

+ 1 - 1
packages/cpt_notice_board/lib/modules/event_detail/page/event_detail_page.dart

@@ -107,7 +107,7 @@ class EventDetailPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         "Lift Padding",
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       body: Container(
           child: EasyRefresh(

+ 1 - 1
packages/cpt_notice_board/lib/modules/notice_board/page/notice_board_page.dart

@@ -107,7 +107,7 @@ class NoticeBoardPage extends HookConsumerWidget {
         appBar: MyAppBar.appBar(
           context,
           "Property",
-          backgroundColor: context.appColors.whiteBG,
+          backgroundColor: context.appColors.backgroundWhite,
         ),
         body: AutoTabsRouter.pageView(
           routes: const [

+ 1 - 1
packages/cpt_payment/lib/modules/add_card/add_card_page.dart

@@ -38,7 +38,7 @@ class AddCardPage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: MyAppBar.appBar(context, S.current.add_new_card),
-      backgroundColor: context.appColors.whiteBG,
+      backgroundColor: context.appColors.backgroundWhite,
       body: SizedBox(
         width: double.infinity,
         child: Column(

+ 1 - 1
packages/cpt_payment/lib/modules/choose_card/choose_card_page.dart

@@ -46,7 +46,7 @@ class ChooseCardPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         S.current.payment,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: SizedBox(

+ 1 - 1
packages/cpt_payment/lib/modules/payment/payment_page.dart

@@ -39,7 +39,7 @@ class PaymentPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         S.current.payment,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: AutoTabsRouter.pageView(

+ 1 - 1
packages/cpt_payment/lib/modules/payment_confirm/payment_confirm_page.dart

@@ -34,7 +34,7 @@ class PaymentConfirmPage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: MyAppBar.appBar(context, "付款的标题"),
-      backgroundColor: context.appColors.whiteBG,
+      backgroundColor: context.appColors.backgroundWhite,
       body: Column(
         mainAxisSize: MainAxisSize.max,
         crossAxisAlignment: CrossAxisAlignment.start,

+ 1 - 1
packages/cpt_payment/lib/modules/payment_info/payment_info_page.dart

@@ -37,7 +37,7 @@ class PaymentInfoPage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: MyAppBar.appBar(context, "付款的标题"),
-      backgroundColor: context.appColors.whiteBG,
+      backgroundColor: context.appColors.backgroundWhite,
       body: Column(
         mainAxisSize: MainAxisSize.max,
         crossAxisAlignment: CrossAxisAlignment.start,

+ 1 - 1
packages/cpt_payment/lib/modules/payment_success/payment_success_page.dart

@@ -34,7 +34,7 @@ class PaymentSuccessPage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: MyAppBar.appBar(context, "付款的标题"),
-      backgroundColor: context.appColors.whiteBG,
+      backgroundColor: context.appColors.backgroundWhite,
       body: SizedBox(
         width: double.infinity,
         child: Column(

+ 6 - 37
packages/cpt_profile/lib/modules/change_mobile/change_mobile_page.dart

@@ -80,6 +80,7 @@ class ChangeMobilePage extends HookConsumerWidget {
                     context,
                     state,
                     "old",
+                    enable: false,
                     textInputType: TextInputType.number,
                     textInputAction: TextInputAction.next,
                     onSubmit: (formKey, value) {
@@ -90,45 +91,11 @@ class ChangeMobilePage extends HookConsumerWidget {
                 ],
               ),
 
-              //旧手机的验证码
-              MyTextView(
-                S.current.verification_code,
-                fontSize: 16.5,
-                marginTop: 13,
-                marginBottom: 15,
-                isFontMedium: true,
-                textColor: context.appColors.textBlack,
-              ),
-
-              // 表单 - 旧的电话号码验证码
-              _buildInputLayout(
-                context,
-                state,
-                "old_code",
-                textInputType: TextInputType.number,
-                textInputAction: TextInputAction.next,
-                errorText: state.oldCodeErrorText,
-                showRightIcon: true,
-                rightWidget: MyTextView(
-                  state.isOldCounting ? "${state.oldCountdownTime} s" : S.current.get_code,
-                  textAlign: TextAlign.center,
-                  textColor: context.appColors.textPrimary,
-                  fontSize: 15,
-                  paddingRight: 5,
-                  isFontMedium: true,
-                  onClick: state.isOldCounting ? null : () => viewModel.showVerifyCodedDialog(false),
-                ).paddingOnly(top: 15, bottom: 15),
-                onSubmit: (formKey, value) {
-                  state.formData[formKey]!['focusNode'].unfocus();
-                  FocusScope.of(context).requestFocus(state.formData['new']!['focusNode']);
-                },
-              ),
-
               //新电话
               MyTextView(
                 S.current.new_mobile_phone,
                 fontSize: 16.5,
-                marginTop: 38,
+                marginTop: 14.5,
                 marginBottom: 15,
                 isFontMedium: true,
                 textColor: context.appColors.textBlack,
@@ -171,7 +138,7 @@ class ChangeMobilePage extends HookConsumerWidget {
               MyTextView(
                 S.current.verification_code,
                 fontSize: 16.5,
-                marginTop: 13,
+                marginTop: 14,
                 marginBottom: 15,
                 isFontMedium: true,
                 textColor: context.appColors.textBlack,
@@ -193,7 +160,7 @@ class ChangeMobilePage extends HookConsumerWidget {
                   fontSize: 15,
                   paddingRight: 5,
                   isFontMedium: true,
-                  onClick: state.isNewCounting ? null : () => viewModel.showVerifyCodedDialog(true),
+                  onClick: state.isNewCounting ? null : () => viewModel.showVerifyCodedDialog(),
                 ).paddingOnly(top: 15, bottom: 15),
                 onSubmit: (formKey, value) {
                   state.formData[formKey]!['focusNode'].unfocus();
@@ -231,6 +198,7 @@ class ChangeMobilePage extends HookConsumerWidget {
     TextInputType textInputType = TextInputType.text,
     String? errorText,
     bool obscureText = false,
+    bool enable = true,
     TextInputAction textInputAction = TextInputAction.done,
     Function? onSubmit,
   }) {
@@ -245,6 +213,7 @@ class ChangeMobilePage extends HookConsumerWidget {
           fontSize: 15.0,
           fontWeight: FontWeight.w500,
         ),
+        enabled: enable,
         controller: state.formData[key]!['controller'],
         focusNode: state.formData[key]!['focusNode'],
         margin: EdgeInsets.only(top: marginTop),

+ 0 - 7
packages/cpt_profile/lib/modules/change_mobile/change_mobile_state.dart

@@ -35,13 +35,6 @@ class ChangeMobileState {
                 'focusNode': FocusNode(),
                 'obsecure': false,
               },
-              'old_code': {
-                'value': '',
-                'controller': TextEditingController(),
-                'hintText': S.current.verification_code,
-                'focusNode': FocusNode(),
-                'obsecure': false,
-              },
               'new': {
                 'value': '',
                 'controller': TextEditingController(),

+ 22 - 53
packages/cpt_profile/lib/modules/change_mobile/change_mobile_view_model.dart

@@ -2,10 +2,12 @@ import 'dart:async';
 
 import 'package:cpt_profile/modules/setting/setting_page.dart';
 import 'package:flutter/material.dart';
+import 'package:plugin_platform/engine/dialog/dialog_engine.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:shared/utils/util.dart';
+import 'package:widgets/widget_export.dart';
 
 import 'change_mobile_state.dart';
 
@@ -28,36 +30,22 @@ class ChangeMobileViewModel extends _$ChangeMobileViewModel {
     state = state.copyWith(oldCodeErrorText: null, newCodeErrorText: null);
 
     final FocusNode oldMobileFocusNode = state.formData['old']!['focusNode'];
-    final FocusNode oldCodeFocusNode = state.formData['old_code']!['focusNode'];
     final FocusNode newMobileFocusNode = state.formData['new']!['focusNode'];
     final FocusNode newCodeFocusNode = state.formData['new_code']!['focusNode'];
 
     final TextEditingController oldMobileController = state.formData['old']!['controller'];
-    final TextEditingController oldCodeController = state.formData['old_code']!['controller'];
     final TextEditingController newMobileController = state.formData['new']!['controller'];
     final TextEditingController newCodeController = state.formData['new_code']!['controller'];
 
     oldMobileFocusNode.unfocus();
-    oldCodeFocusNode.unfocus();
     newMobileFocusNode.unfocus();
     newCodeFocusNode.unfocus();
 
     final oldMobile = oldMobileController.text;
-    final oldCode = oldCodeController.text;
     final newMobile = newMobileController.text;
     final newCode = newCodeController.text;
 
-    Log.d('当前待提交的 oldMobile:$oldMobile oldCode:$oldCode newMobile:$newMobile newCode:$newCode');
-
-    if (Utils.isEmpty(oldMobile)) {
-      ToastEngine.show("Enter Old Mobile Phone");
-      return;
-    }
-
-    if (Utils.isEmpty(oldCode)) {
-      state = state.copyWith(oldCodeErrorText: "Old mobile phone verification code cannot be empty!");
-      return;
-    }
+    Log.d('当前待提交的 newMobile:$newMobile newCode:$newCode');
 
     if (Utils.isEmpty(newMobile)) {
       ToastEngine.show("Enter New Mobile Phone");
@@ -70,43 +58,34 @@ class ChangeMobileViewModel extends _$ChangeMobileViewModel {
     }
 
     //执行密码登录
-    ToastEngine.show('准备执行请求发送验证码 oldMobile:$oldMobile oldCode:$oldCode newMobile:$newMobile newCode:$newCode');
+    ToastEngine.show('准备执行请求发送验证码 newMobile:$newMobile newCode:$newCode');
 
     //返回设置页面
     SettingPage.startInstance();
   }
 
   //展示发送验证码弹窗
-  showVerifyCodedDialog(bool isNewMobile) {
-    if (isNewMobile) {
-      _startNewCountDown();
-    } else {
-      _startOldCountDown();
-    }
-  }
-
-  Timer? oldCountdownTimer;
-  Timer? newCountdownTimer;
+  showVerifyCodedDialog() {
 
-  /// 开启倒计时 - Old
-  void _startOldCountDown() {
-    //60秒倒计时
-    state = state.copyWith(isOldCounting: true, oldCountdownTime: 60);
+    //展示对应的验证码弹窗
+    _showCAPTCHADialog();
+  }
 
-    //每秒的倒计时
-    oldCountdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
-      int time = state.oldCountdownTime;
-      Log.d('Old倒计时-->$time');
-      if (time > 0) {
-        time--;
-        state = state.copyWith(isOldCounting: true, oldCountdownTime: time);
-      } else {
-        state = state.copyWith(isOldCounting: false, oldCountdownTime: 0);
-        oldCountdownTimer?.cancel(); // 取消计时器
-      }
-    });
+  void _showCAPTCHADialog() {
+    DialogEngine.show(
+      onDismiss: () {
+      },
+      widget: VerifyCodeDialog(
+        confirmAction: (key, code) {
+          //发送验证码
+          _startNewCountDown();
+        },
+      ),
+    );
   }
 
+  Timer? newCountdownTimer;
+
   /// 开启倒计时 - New
   void _startNewCountDown() {
     //60秒倒计时
@@ -128,16 +107,8 @@ class ChangeMobileViewModel extends _$ChangeMobileViewModel {
 
   //初始化监听
   void initListener(ChangeMobileState initState) {
-    final FocusNode oldCodeFocusNode = initState.formData['old_code']!['focusNode'];
     final FocusNode newCodeFocusNode = initState.formData['new_code']!['focusNode'];
 
-    oldCodeFocusNode.addListener(() {
-      // 获取焦点的时候清空错误文本
-      if (oldCodeFocusNode.hasFocus) {
-        state = state.copyWith(oldCodeErrorText: null);
-      }
-    });
-
     newCodeFocusNode.addListener(() {
       // 获取焦点的时候清空错误文本
       if (newCodeFocusNode.hasFocus) {
@@ -148,14 +119,12 @@ class ChangeMobileViewModel extends _$ChangeMobileViewModel {
 
   //销毁资源
   void onDispose(ChangeMobileState initState) {
-    final FocusNode oldCodeFocusNode = initState.formData['old_code']!['focusNode'];
     final FocusNode newCodeFocusNode = initState.formData['new_code']!['focusNode'];
-    oldCodeFocusNode.dispose();
     newCodeFocusNode.dispose();
 
-    oldCountdownTimer?.cancel();
     newCountdownTimer?.cancel();
 
     Log.d("ChangeMobileViewModel 销毁 onDispose");
   }
+
 }

+ 70 - 61
packages/cpt_profile/lib/modules/my_estate/item_estate.dart

@@ -1,3 +1,4 @@
+import 'package:cs_resources/generated/assets.dart';
 import 'package:cs_resources/generated/l10n.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:flutter/material.dart';
@@ -6,7 +7,7 @@ import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 
 class EstateItem extends StatelessWidget {
-  final int childIndex;  //组内的索引
+  final int childIndex; //组内的索引
   final String item;
   final VoidCallback deleteAction;
 
@@ -18,29 +19,30 @@ class EstateItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      width: double.infinity,
-      color: context.appColors.whiteBG,
-      margin: EdgeInsets.only(top: childIndex == 0 ? 0 : 10),
-      padding: const EdgeInsets.only(top: 22.5),
-      child: Column(
-        children: [
-          Row(
+    return Stack(
+      children: [
+        Container(
+          width: double.infinity,
+          color: context.appColors.whiteBG,
+          padding: const EdgeInsets.only(top: 22.5),
+          margin: EdgeInsets.only(top: childIndex == 0 ? 0 : 10),
+          child: Column(
             children: [
-              MyLoadImage(
-                "https://img1.baidu.com/it/u=1656098746,3560654086&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-                width: 65,
-                height: 65,
-                isCircle: true,
-              ).marginOnly(right: 17, left: 15),
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+              Row(
                 children: [
-                  //标题
-                  Row(
-                    mainAxisSize: MainAxisSize.max,
-                    crossAxisAlignment: CrossAxisAlignment.center,
+                  MyLoadImage(
+                    "https://img1.baidu.com/it/u=1656098746,3560654086&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
+                    width: 65,
+                    height: 65,
+                    isCircle: true,
+                  ).marginOnly(
+                    right: 17,
+                    left: 15,
+                  ),
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
+                      const SizedBox(height: 22.5),
                       //姓名
                       MyTextView(
                         "Wu Bing Bing",
@@ -48,54 +50,61 @@ class EstateItem extends StatelessWidget {
                         isFontBold: true,
                         textColor: context.appColors.textBlack,
                         maxLines: 2,
-                      ).expanded(),
+                      ),
 
-                      //删除
                       MyTextView(
-                        S.current.remove,
-                        marginRight: 15,
-                        fontSize: 16,
-                        onClick: deleteAction,
-                        isFontMedium: true,
-                        textColor: context.appColors.deleteRed,
+                        "Owner",
+                        fontSize: 15,
+                        isFontRegular: true,
+                        textColor: context.appColors.textBlack,
                       ),
-                    ],
-                  ),
-
-                  MyTextView(
-                    "Owner",
-                    fontSize: 15,
-                    isFontRegular: true,
-                    textColor: context.appColors.textBlack,
-                  ),
 
-                  MyTextView(
-                    "Block 35 #08-29",
-                    fontSize: 15,
-                    isFontRegular: true,
-                    textColor: context.appColors.textBlack,
-                  ),
+                      MyTextView(
+                        "Block 35 #08-29",
+                        fontSize: 15,
+                        isFontRegular: true,
+                        textColor: context.appColors.textBlack,
+                      ),
+                    ],
+                  ).expanded(),
                 ],
-              ).expanded(),
+              ),
+              const SizedBox(height: 22.5),
+              Divider(
+                height: 0.5,
+                color: context.appColors.backgroundDark,
+              ),
+              Center(
+                child: MyTextView(
+                  S.current.remove,
+                  paddingTop: 16,
+                  paddingBottom: 16,
+                  fontSize: 16,
+                  isFontMedium: true,
+                  textColor: context.appColors.textPrimary,
+                ),
+              )
             ],
           ),
-          const SizedBox(height: 22.5),
-          Divider(
-            height: 0.5,
-            color: context.appColors.backgroundDark,
+        ),
+
+        Visibility(
+          visible: true,
+          child: MyAssetImage(
+            Assets.profileMyEstateDefault,
+            width: 76,
+            height: 44,
           ),
-          Center(
-            child: MyTextView(
-              S.current.active,
-              paddingTop: 16,
-              paddingBottom: 16,
-              fontSize: 16,
-              isFontMedium: true,
-              textColor: context.appColors.textPrimary,
-            ),
-          )
-        ],
-      ),
+        ).marginOnly(top: childIndex == 0 ? 0 : 10).alignRight(),
+
+        MyTextView(
+          S.current.approved,
+          fontSize: 16,
+          onClick: deleteAction,
+          isFontMedium: true,
+          textColor: context.appColors.textGreen,
+        ).marginOnly(top: childIndex == 0 ? 46.5 : 56.5, right: 15).alignRight()
+      ],
     );
   }
 }

+ 1 - 1
packages/cpt_profile/lib/modules/my_estate/my_estate_page.dart

@@ -47,7 +47,7 @@ class MyEstatePage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         S.current.yy_home_accounts,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: Column(

+ 1 - 1
packages/cpt_profile/lib/modules/my_household/my_household_page.dart

@@ -44,7 +44,7 @@ class MyHouseholdPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         S.current.household_members,
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       backgroundColor: context.appColors.backgroundDark,
       body: SizedBox(

+ 1 - 1
packages/cpt_profile/lib/modules/profile_edit/Profile_edit_page.dart

@@ -35,7 +35,7 @@ class ProfileEditPage extends HookConsumerWidget {
     final state = ref.watch(profileEditViewModelProvider);
 
     return Scaffold(
-      appBar: MyAppBar.appBar(context, S.current.edit_profile,backgroundColor: context.appColors.whiteBG),
+      appBar: MyAppBar.appBar(context, S.current.edit_profile,backgroundColor: context.appColors.backgroundWhite),
       backgroundColor: context.appColors.backgroundDefault,
       body: SingleChildScrollView(
         scrollDirection: Axis.vertical,

+ 1 - 1
packages/cpt_profile/lib/modules/setting/setting_page.dart

@@ -33,7 +33,7 @@ class SettingPage extends HookConsumerWidget {
     final state = ref.watch(settingViewModelProvider);
 
     return Scaffold(
-      appBar: MyAppBar.appBar(context, S.current.settings, backgroundColor: context.appColors.whiteBG),
+      appBar: MyAppBar.appBar(context, S.current.settings, backgroundColor: context.appColors.backgroundWhite),
       backgroundColor: context.appColors.backgroundDark,
       body: SingleChildScrollView(
         scrollDirection: Axis.vertical,

+ 1 - 1
packages/cpt_property/lib/modules/property/page/property_page.dart

@@ -96,7 +96,7 @@ class PropertyPage extends HookConsumerWidget {
         appBar: MyAppBar.appBar(
           context,
           "Property",
-          backgroundColor: context.appColors.whiteBG,
+          backgroundColor: context.appColors.backgroundWhite,
         ),
         body: AutoTabsRouter.pageView(
           routes: const [

+ 1 - 1
packages/cpt_services/lib/modules/services/services_page.dart

@@ -173,7 +173,7 @@ class ServicesPage extends HookConsumerWidget {
       appBar: MyAppBar.appBar(
         context,
         "Service",
-        backgroundColor: context.appColors.whiteBG,
+        backgroundColor: context.appColors.backgroundWhite,
       ),
       body: Container(
         child: Column(

BIN
packages/cs_resources/assets/profile/my_estate_default.webp


+ 1 - 0
packages/cs_resources/lib/generated/assets.dart

@@ -166,6 +166,7 @@ class Assets {
   static const String profileEditProfileAvatarBottom = 'assets/profile/edit_profile_avatar_bottom.webp';
   static const String profileEditProfileAvatarDefault = 'assets/profile/edit_profile_avatar_default.webp';
   static const String profileEditXuLine = 'assets/profile/edit_xu_line.webp';
+  static const String profileMyEstateDefault = 'assets/profile/my_estate_default.webp';
   static const String profileRemoveAccountImg = 'assets/profile/remove_account_img.webp';
   static const String propertyAdvicePic = 'assets/property/advice_pic.webp';
   static const String propertyApproval = 'assets/property/approval.webp';

+ 3 - 0
packages/cs_resources/lib/generated/intl/messages_en.dart

@@ -80,6 +80,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "booking_successful":
             MessageLookupByLibrary.simpleMessage("BOOKING SUCCESSFUL"),
         "cancel": MessageLookupByLibrary.simpleMessage("Cancel"),
+        "captcha": MessageLookupByLibrary.simpleMessage("CAPTCHA"),
         "car_cancel_signature_txt": MessageLookupByLibrary.simpleMessage(
             "the resident,herein confirm that we have read and will fully abide by the rules & regulations governing car parking of Parc Life. We  further undertake to display the car park label, prominently on the top left(passenger side) portion of the front windscreen of our vehicle at all times whilst in Parc Life."),
         "car_cancel_txt": MessageLookupByLibrary.simpleMessage(
@@ -143,6 +144,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "enable_notification":
             MessageLookupByLibrary.simpleMessage("Enable Notification"),
         "end_date_caps": MessageLookupByLibrary.simpleMessage("END DATE"),
+        "enter_captcha": MessageLookupByLibrary.simpleMessage("Enter CAPTCHA"),
         "estate": MessageLookupByLibrary.simpleMessage("Estate"),
         "estate_name_desc": MessageLookupByLibrary.simpleMessage(
             "Tell us the name of the estateor building you are applying to"),
@@ -319,6 +321,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Re-Registration of Bicycles"),
         "registration_of_2_vehicle":
             MessageLookupByLibrary.simpleMessage("Registration of 2nd Vehicle"),
+        "rejected": MessageLookupByLibrary.simpleMessage("Rejected"),
         "remove": MessageLookupByLibrary.simpleMessage("Remove"),
         "remove_account":
             MessageLookupByLibrary.simpleMessage("Remove Account"),

+ 1 - 313
packages/cs_resources/lib/generated/intl/messages_zh_CN.dart

@@ -20,318 +20,6 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'zh_CN';
 
-  static String m0(time) => "批准于${time}";
-
-  static String m1(name) => "${name} 已预定";
-
-  static String m2(count) => "${count} 字符";
-
-  static String m3(time) => "处理于${time}";
-
-  static String m4(count, date) => "你还剩余${count}次的配额 (重置于${date})";
-
-  static String m5(time) => "提交于${time}";
-
-  static String m6(name) => "欢迎你 ${name}";
-
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "access_card_desc": MessageLookupByLibrary.simpleMessage(
-            "请输入故障损坏或丢失的门禁卡号的序列号,或提供所有可用门禁卡的序列号。"),
-        "access_card_owner": MessageLookupByLibrary.simpleMessage("业主门禁卡"),
-        "access_card_tenant": MessageLookupByLibrary.simpleMessage("租户门禁卡"),
-        "access_card_tenant_letter":
-            MessageLookupByLibrary.simpleMessage("请附上业主授权书副本"),
-        "access_date": MessageLookupByLibrary.simpleMessage("访问日期"),
-        "account_deactivate_alert": MessageLookupByLibrary.simpleMessage(
-            "您确定要停用您的帐户吗?一旦您继续执行请求,您将无法登录应用程序。"),
-        "account_deactivation": MessageLookupByLibrary.simpleMessage("删除账号"),
-        "active": MessageLookupByLibrary.simpleMessage("可用"),
-        "add": MessageLookupByLibrary.simpleMessage("添加"),
-        "add_card": MessageLookupByLibrary.simpleMessage("添加银行卡"),
-        "add_new_card": MessageLookupByLibrary.simpleMessage("添加新卡"),
-        "administrator_reply": MessageLookupByLibrary.simpleMessage("管理员回复"),
-        "agree_to": MessageLookupByLibrary.simpleMessage("同意"),
-        "alert": MessageLookupByLibrary.simpleMessage("提示"),
-        "apply": MessageLookupByLibrary.simpleMessage("可申请"),
-        "approved": MessageLookupByLibrary.simpleMessage("已批准"),
-        "approved_on_sometime": m0,
-        "attachments": MessageLookupByLibrary.simpleMessage("附件"),
-        "back_home": MessageLookupByLibrary.simpleMessage("返回首页"),
-        "bicycle_desc": MessageLookupByLibrary.simpleMessage("请上传您的自行车照片"),
-        "bicycle_note":
-            MessageLookupByLibrary.simpleMessage("请注明自行车的型号、品牌、颜色和自行车类型。"),
-        "block": MessageLookupByLibrary.simpleMessage("街区"),
-        "block_desc": MessageLookupByLibrary.simpleMessage("街区是指单位官方邮编街道号"),
-        "block_example":
-            MessageLookupByLibrary.simpleMessage("123 示例路 #08-08 国家 123456"),
-        "block_example_desc":
-            MessageLookupByLibrary.simpleMessage("123 是街区地址邮编 #08-08 是单元号码"),
-        "book": MessageLookupByLibrary.simpleMessage("预定"),
-        "booked_by_someone": m1,
-        "booking_fee": MessageLookupByLibrary.simpleMessage("预定费用"),
-        "booking_successful": MessageLookupByLibrary.simpleMessage("预定成功"),
-        "cancel": MessageLookupByLibrary.simpleMessage("取消"),
-        "car_cancel_signature_txt": MessageLookupByLibrary.simpleMessage(
-            "居民在此确认,我们已阅读并将完全遵守Parc Life的停车规则和规定。我们进一步承诺,在Parc Life期间,我们将始终在车辆前挡风玻璃的左上角(乘客侧)突出显示停车场标签。"),
-        "car_cancel_txt": MessageLookupByLibrary.simpleMessage("请提供以下信息。"),
-        "car_cancel_txt_1": MessageLookupByLibrary.simpleMessage("1.车辆序列号"),
-        "car_cancel_txt_2": MessageLookupByLibrary.simpleMessage("2.车位取消的实施日期"),
-        "car_park_cancellation": MessageLookupByLibrary.simpleMessage("取消停车位"),
-        "card_caps": MessageLookupByLibrary.simpleMessage("信用卡"),
-        "card_number": MessageLookupByLibrary.simpleMessage("银行卡号"),
-        "change": MessageLookupByLibrary.simpleMessage("更换"),
-        "change_mobile_phone": MessageLookupByLibrary.simpleMessage("修改手机号码"),
-        "characters": m2,
-        "choose_an_option": MessageLookupByLibrary.simpleMessage("选择一个选项"),
-        "choose_category": MessageLookupByLibrary.simpleMessage("选择类型"),
-        "community": MessageLookupByLibrary.simpleMessage("社区"),
-        "company_address": MessageLookupByLibrary.simpleMessage("公司地址"),
-        "confirm": MessageLookupByLibrary.simpleMessage("确认"),
-        "confirm_new_password": MessageLookupByLibrary.simpleMessage("确认新密码"),
-        "confirm_password": MessageLookupByLibrary.simpleMessage("确认密码"),
-        "convert_large_recurring_payments_to":
-            MessageLookupByLibrary.simpleMessage("将大额的经常性消费转换为"),
-        "create_new_feedback": MessageLookupByLibrary.simpleMessage("创建新的反馈"),
-        "create_new_yy_home_account":
-            MessageLookupByLibrary.simpleMessage("创建新的 YY Home 账户"),
-        "credit_debit_card": MessageLookupByLibrary.simpleMessage("信用卡或借记卡"),
-        "date_of_entry": MessageLookupByLibrary.simpleMessage("进入日期"),
-        "delete": MessageLookupByLibrary.simpleMessage("删除"),
-        "deposit": MessageLookupByLibrary.simpleMessage("押金"),
-        "deposit_amount": MessageLookupByLibrary.simpleMessage("押金总金额"),
-        "deposit_desc": MessageLookupByLibrary.simpleMessage("押金详情描述:"),
-        "deposit_desc_txt": MessageLookupByLibrary.simpleMessage(
-            "押金是使用社区服务的一部分,在使用服务后,它将自动发放到您相应的银行卡上。请仔细检查"),
-        "deposit_hold": MessageLookupByLibrary.simpleMessage("当前押金"),
-        "deposit_released": MessageLookupByLibrary.simpleMessage("押金已退还"),
-        "deposit_released_caps": MessageLookupByLibrary.simpleMessage("押金已退还"),
-        "describe_your_feedback":
-            MessageLookupByLibrary.simpleMessage("描述您的反馈"),
-        "did_not_receive": MessageLookupByLibrary.simpleMessage("没有收到验证码?"),
-        "edit_profile": MessageLookupByLibrary.simpleMessage("编辑个人信息"),
-        "email": MessageLookupByLibrary.simpleMessage("邮箱"),
-        "enable_notification": MessageLookupByLibrary.simpleMessage("允许通知"),
-        "end_date_caps": MessageLookupByLibrary.simpleMessage("结束时间"),
-        "estate": MessageLookupByLibrary.simpleMessage("房产"),
-        "estate_name_desc":
-            MessageLookupByLibrary.simpleMessage("告诉我们您申请的公寓楼的名称"),
-        "estate_or_building_name":
-            MessageLookupByLibrary.simpleMessage("房产或建筑名称?"),
-        "facility": MessageLookupByLibrary.simpleMessage("设施"),
-        "facility_active": MessageLookupByLibrary.simpleMessage("可用"),
-        "fee_paid": MessageLookupByLibrary.simpleMessage("已支付"),
-        "feedback": MessageLookupByLibrary.simpleMessage("反馈"),
-        "feedback_details": MessageLookupByLibrary.simpleMessage("反馈详情"),
-        "feedback_msg_1": MessageLookupByLibrary.simpleMessage("帮助我们保持您的房产美丽"),
-        "feedback_msg_2": MessageLookupByLibrary.simpleMessage(
-            "有些事情需要我们关注,或者如果你有一个很棒的建议,我们想听听你的意见!"),
-        "first_name": MessageLookupByLibrary.simpleMessage("名"),
-        "followers": MessageLookupByLibrary.simpleMessage("粉丝"),
-        "following": MessageLookupByLibrary.simpleMessage("关注"),
-        "forgot_password": MessageLookupByLibrary.simpleMessage("忘记密码?"),
-        "forgot_text": MessageLookupByLibrary.simpleMessage("请输入您的邮箱和手机号码"),
-        "form": MessageLookupByLibrary.simpleMessage("表单"),
-        "form_submit_title": MessageLookupByLibrary.simpleMessage("已提交"),
-        "full_name": MessageLookupByLibrary.simpleMessage("全名"),
-        "get_code": MessageLookupByLibrary.simpleMessage("获取验证码"),
-        "get_started": MessageLookupByLibrary.simpleMessage("让我们开始吧"),
-        "guest_mobile_number": MessageLookupByLibrary.simpleMessage("访客手机号码"),
-        "guest_name": MessageLookupByLibrary.simpleMessage("访客姓名"),
-        "hacking_end_date": MessageLookupByLibrary.simpleMessage("施工结束日期"),
-        "hacking_start_date": MessageLookupByLibrary.simpleMessage("施工开始日期"),
-        "have_fun": MessageLookupByLibrary.simpleMessage("祝您愉快!"),
-        "history": MessageLookupByLibrary.simpleMessage("历史记录"),
-        "home": MessageLookupByLibrary.simpleMessage("首页"),
-        "household": MessageLookupByLibrary.simpleMessage("家庭"),
-        "household_members": MessageLookupByLibrary.simpleMessage("家庭成员"),
-        "in_progress": MessageLookupByLibrary.simpleMessage("处理中"),
-        "inactive": MessageLookupByLibrary.simpleMessage("不可用"),
-        "info": MessageLookupByLibrary.simpleMessage("咨询"),
-        "info_desc1": MessageLookupByLibrary.simpleMessage(
-            "立即将您的经常性消费转换为有价值的里程、奖励和现金返还!"),
-        "info_desc2": MessageLookupByLibrary.simpleMessage("商务舱便宜60%!"),
-        "info_desc3": MessageLookupByLibrary.simpleMessage(
-            "Sundy用信用卡支付MCST费用,以帮助她积累62000美元的年度支出。一切加起来!"),
-        "info_desc4": MessageLookupByLibrary.simpleMessage(
-            "她的信用卡每消费一美元就奖励她1.5英里*,为她赚取93000英里。"),
-        "info_desc5": MessageLookupByLibrary.simpleMessage(
-            "Sundy能够乘坐价值4000美元的商务舱前往东京,只需支付1488美元的YY Home Pay处理费,节省了60%以上!"),
-        "info_desc6": MessageLookupByLibrary.simpleMessage("请查看您的信用卡奖励以获取更多信息"),
-        "internal": MessageLookupByLibrary.simpleMessage("内部"),
-        "introduction_to_info_pack":
-            MessageLookupByLibrary.simpleMessage("信息介绍"),
-        "iu_number": MessageLookupByLibrary.simpleMessage("IU 编号"),
-        "label_replace_note": MessageLookupByLibrary.simpleMessage(
-            "如果您想在申请时给管理层留一张便条,请在此处留下。\n\n更换汽车标签时,请附上损坏汽车标签的序列号。"),
-        "label_txt": MessageLookupByLibrary.simpleMessage("请随车辆登记表附上以下文件:"),
-        "label_txt_1": MessageLookupByLibrary.simpleMessage("1)一张机动车登记或日志卡"),
-        "label_txt_2": MessageLookupByLibrary.simpleMessage("2)公司车辆需要公司授权书"),
-        "label_txt_3": MessageLookupByLibrary.simpleMessage("3)租车需要租车协议。"),
-        "last_name": MessageLookupByLibrary.simpleMessage("姓"),
-        "latest_news": MessageLookupByLibrary.simpleMessage("最新消息"),
-        "latest_transactions": MessageLookupByLibrary.simpleMessage("最新交易"),
-        "license_plate_number": MessageLookupByLibrary.simpleMessage("车牌号"),
-        "list_of_renovation_works":
-            MessageLookupByLibrary.simpleMessage("装修工程清单"),
-        "login": MessageLookupByLibrary.simpleMessage("登录"),
-        "logout": MessageLookupByLibrary.simpleMessage("退出登录"),
-        "logout_alert": MessageLookupByLibrary.simpleMessage("你确定要退出登录吗?"),
-        "mark_all": MessageLookupByLibrary.simpleMessage("标记全部"),
-        "me": MessageLookupByLibrary.simpleMessage("我的"),
-        "mobile_number_caps": MessageLookupByLibrary.simpleMessage("手机号码"),
-        "mobile_phone": MessageLookupByLibrary.simpleMessage("手机号码"),
-        "moving_in": MessageLookupByLibrary.simpleMessage("搬入"),
-        "moving_in_msg": MessageLookupByLibrary.simpleMessage(
-            "如果您想在申请时给管理层留一张便条或有任何特殊要求,请在此处留下。"),
-        "moving_out": MessageLookupByLibrary.simpleMessage("搬出"),
-        "my_post": MessageLookupByLibrary.simpleMessage("我的发布"),
-        "name_on_card": MessageLookupByLibrary.simpleMessage("银行卡姓名"),
-        "new_mobile_phone": MessageLookupByLibrary.simpleMessage("新的手机号码"),
-        "new_password": MessageLookupByLibrary.simpleMessage("新密码"),
-        "next": MessageLookupByLibrary.simpleMessage("下一步"),
-        "no": MessageLookupByLibrary.simpleMessage("否"),
-        "not_approved": MessageLookupByLibrary.simpleMessage("未批准"),
-        "not_approved_on_sometime": m3,
-        "notes": MessageLookupByLibrary.simpleMessage("备注"),
-        "notes_to_management": MessageLookupByLibrary.simpleMessage("给管理员备注"),
-        "notes_to_recipient": MessageLookupByLibrary.simpleMessage("收款人通知"),
-        "notice_board": MessageLookupByLibrary.simpleMessage("消息板"),
-        "notification": MessageLookupByLibrary.simpleMessage("通知"),
-        "nric_fin": MessageLookupByLibrary.simpleMessage("身份证/签证"),
-        "old_mobile_phone": MessageLookupByLibrary.simpleMessage("旧的手机号码"),
-        "on_hold": MessageLookupByLibrary.simpleMessage("持有"),
-        "or": MessageLookupByLibrary.simpleMessage("或者"),
-        "other": MessageLookupByLibrary.simpleMessage("其他"),
-        "overnight_parking": MessageLookupByLibrary.simpleMessage("通宵停车"),
-        "overnight_parking_msg":
-            MessageLookupByLibrary.simpleMessage("请提供过夜停车时间。"),
-        "owner": MessageLookupByLibrary.simpleMessage("业主"),
-        "owner_or_tenant": MessageLookupByLibrary.simpleMessage("您是业主还是租户?"),
-        "owners_desc1": MessageLookupByLibrary.simpleMessage("我的名字在分层标题上"),
-        "owners_desc2":
-            MessageLookupByLibrary.simpleMessage("我的名字在分层标题上,并且我已经把我的单元租出去了"),
-        "owners_desc3": MessageLookupByLibrary.simpleMessage("我和名字的主人住在同一个家庭"),
-        "owners_desc4": MessageLookupByLibrary.simpleMessage("我是拥有该单元的公司的股东"),
-        "owners_desc5": MessageLookupByLibrary.simpleMessage("管理员将相应地验证您的申请"),
-        "ownership_status": MessageLookupByLibrary.simpleMessage("所有权状态"),
-        "paid_on": MessageLookupByLibrary.simpleMessage("付款时间"),
-        "password": MessageLookupByLibrary.simpleMessage("密码"),
-        "password_format": MessageLookupByLibrary.simpleMessage("8位数字或字母"),
-        "pay_fees_with": MessageLookupByLibrary.simpleMessage("支付MCST费用"),
-        "payment": MessageLookupByLibrary.simpleMessage("支付"),
-        "payment_details": MessageLookupByLibrary.simpleMessage("支付详情"),
-        "phone_email": MessageLookupByLibrary.simpleMessage("电话或邮箱"),
-        "primary_card": MessageLookupByLibrary.simpleMessage("主卡"),
-        "privacy_policy": MessageLookupByLibrary.simpleMessage("隐私协议"),
-        "proceed_with_payment": MessageLookupByLibrary.simpleMessage("继续付款"),
-        "processing_in_progress":
-            MessageLookupByLibrary.simpleMessage("正在处理中,请耐心等待..."),
-        "property": MessageLookupByLibrary.simpleMessage("房产"),
-        "property_guide": MessageLookupByLibrary.simpleMessage("物业指南"),
-        "property_news": MessageLookupByLibrary.simpleMessage("资产新闻"),
-        "publish": MessageLookupByLibrary.simpleMessage("公布"),
-        "published_successful_txt":
-            MessageLookupByLibrary.simpleMessage("您的反馈已发送成功,我们会尽快回复您的反馈,谢谢!"),
-        "published_successfully": MessageLookupByLibrary.simpleMessage("发布成功"),
-        "quota_left_msg": m4,
-        "rate_us": MessageLookupByLibrary.simpleMessage("评价我们"),
-        "re_registration_of_1_vehicle_owner":
-            MessageLookupByLibrary.simpleMessage("业主第一辆车重新登记"),
-        "re_registration_of_1_vehicle_tenant":
-            MessageLookupByLibrary.simpleMessage("租户第一辆车重新登记"),
-        "re_registration_of_bicycle":
-            MessageLookupByLibrary.simpleMessage("自行车重新登记"),
-        "registration_of_2_vehicle":
-            MessageLookupByLibrary.simpleMessage("第二辆车登记"),
-        "remove": MessageLookupByLibrary.simpleMessage("移除"),
-        "remove_account": MessageLookupByLibrary.simpleMessage("移除账号"),
-        "remove_account_tips":
-            MessageLookupByLibrary.simpleMessage("你确定要移除你的账号吗?"),
-        "renovation": MessageLookupByLibrary.simpleMessage("装修"),
-        "renovation_attachments": MessageLookupByLibrary.simpleMessage(
-            "为协助我们批准您的申请,请附上以下文件:\n\n1.拟建装修平面图及图纸\n\n2.专业工程师认可\n\n3.电气布置\n\n4.业主和承包商的共同赔偿"),
-        "renovation_end_date": MessageLookupByLibrary.simpleMessage("装修结束日期"),
-        "renovation_note": MessageLookupByLibrary.simpleMessage(
-            "请列出参与您装修的所有其他分包商。\n\n如果您想在提交此申请时给管理层留言或有任何特殊要求,请在此处留言。"),
-        "renovation_start_date": MessageLookupByLibrary.simpleMessage("装修开始日期"),
-        "resend_code": MessageLookupByLibrary.simpleMessage("重新发送"),
-        "reset_password": MessageLookupByLibrary.simpleMessage("重置密码"),
-        "rewards": MessageLookupByLibrary.simpleMessage("奖励"),
-        "send_feedback": MessageLookupByLibrary.simpleMessage("发送反馈"),
-        "send_feedback_management":
-            MessageLookupByLibrary.simpleMessage("如果您想了解更多信息,请向管理层发送反馈"),
-        "send_on_sometime": m5,
-        "sent": MessageLookupByLibrary.simpleMessage("发送"),
-        "service": MessageLookupByLibrary.simpleMessage("服务"),
-        "set_primary_card": MessageLookupByLibrary.simpleMessage("设为主卡"),
-        "settings": MessageLookupByLibrary.simpleMessage("设置"),
-        "sign_up_success_txt1":
-            MessageLookupByLibrary.simpleMessage("您已成功创建 YYHome 的帐户"),
-        "sign_up_success_txt2":
-            MessageLookupByLibrary.simpleMessage("您的用户名是您的电子邮件地址,请保护您的密码安全"),
-        "sign_up_success_txt3":
-            MessageLookupByLibrary.simpleMessage("现在,让我们把你和你的社区关联起来"),
-        "sign_up_verify_txt":
-            MessageLookupByLibrary.simpleMessage("我们已经向您发送了短信验证码,请在下面输入"),
-        "signature": MessageLookupByLibrary.simpleMessage("签名"),
-        "signature_vehicle": MessageLookupByLibrary.simpleMessage(
-            "I,the resident,herein confirm that we have read and will fully abide by the rules & regulations governing car parking of Parc Life. We  further undertake to display the car park label, prominently on the top left(passenger side) portion of the front windscreen of our vehicle at all times whilst in Parc Life."),
-        "signed_and_agreed_by": MessageLookupByLibrary.simpleMessage("签字并同意"),
-        "start_date_caps": MessageLookupByLibrary.simpleMessage("开始时间"),
-        "status": MessageLookupByLibrary.simpleMessage("状态"),
-        "strata_management_guides":
-            MessageLookupByLibrary.simpleMessage("管理手册"),
-        "submit": MessageLookupByLibrary.simpleMessage("提交"),
-        "tenant": MessageLookupByLibrary.simpleMessage("租户"),
-        "tenants_desc1": MessageLookupByLibrary.simpleMessage("我的名字在租赁协议上"),
-        "tenants_desc2": MessageLookupByLibrary.simpleMessage("我和指定的租户住在同一个家庭"),
-        "tenants_desc3": MessageLookupByLibrary.simpleMessage("我是租用该单元的公司的租户"),
-        "tenants_desc4": MessageLookupByLibrary.simpleMessage("管理员将相应地验证您的申请"),
-        "terms_conditions": MessageLookupByLibrary.simpleMessage("服务条款"),
-        "terms_of_service": MessageLookupByLibrary.simpleMessage("服务条款"),
-        "time_of_arrival": MessageLookupByLibrary.simpleMessage("到达时间"),
-        "title": MessageLookupByLibrary.simpleMessage("标题"),
-        "total": MessageLookupByLibrary.simpleMessage("共计"),
-        "tries_left": MessageLookupByLibrary.simpleMessage("次尝试机会"),
-        "type_here": MessageLookupByLibrary.simpleMessage("在此输入"),
-        "type_of_application": MessageLookupByLibrary.simpleMessage("申请类型"),
-        "unit_number": MessageLookupByLibrary.simpleMessage("单元"),
-        "up_to_max_images":
-            MessageLookupByLibrary.simpleMessage("(您最多可以上传10张图片)"),
-        "upload": MessageLookupByLibrary.simpleMessage("上传"),
-        "upload_a_photo": MessageLookupByLibrary.simpleMessage("上传照片"),
-        "upload_doc_desc": MessageLookupByLibrary.simpleMessage(
-            "管理员要求您上传以下文件以验证您的租约。您可以编辑敏感的财务信息"),
-        "upload_doc_desc1": MessageLookupByLibrary.simpleMessage(
-            "(1)一份有效的租赁协议,显示您的姓名、单位编号、租赁到期日期和居住者名单(如果适用)"),
-        "upload_doc_desc2":
-            MessageLookupByLibrary.simpleMessage("(2)租赁协议印花税收据"),
-        "upload_documents": MessageLookupByLibrary.simpleMessage("上传文档"),
-        "upload_pictures": MessageLookupByLibrary.simpleMessage("上传图片"),
-        "vehicle_label_replacement":
-            MessageLookupByLibrary.simpleMessage("车辆标签更换"),
-        "vehicle_make_model_colour":
-            MessageLookupByLibrary.simpleMessage("车辆品牌/型号/颜色"),
-        "vehicle_number": MessageLookupByLibrary.simpleMessage("车牌号"),
-        "verification_code": MessageLookupByLibrary.simpleMessage("验证码"),
-        "version_no": MessageLookupByLibrary.simpleMessage("版本号."),
-        "view": MessageLookupByLibrary.simpleMessage("查看"),
-        "visitor": MessageLookupByLibrary.simpleMessage("访客"),
-        "visitor_active": MessageLookupByLibrary.simpleMessage("可用的"),
-        "visitor_msg": MessageLookupByLibrary.simpleMessage(
-            "社区访客系统是一个智能系统,旨在加强社区安全管理,方便访客访问。"),
-        "visitor_now": MessageLookupByLibrary.simpleMessage("当前的"),
-        "visitor_registration": MessageLookupByLibrary.simpleMessage("访客登记"),
-        "waiting_for_the_administrator":
-            MessageLookupByLibrary.simpleMessage("等待管理员回复"),
-        "welcome_name": m6,
-        "who_are_owners": MessageLookupByLibrary.simpleMessage("怎样才算业主?"),
-        "who_are_tenants": MessageLookupByLibrary.simpleMessage("怎样才算租户?"),
-        "yes": MessageLookupByLibrary.simpleMessage("是"),
-        "you_have": MessageLookupByLibrary.simpleMessage("你还有"),
-        "your_roles_responsibilities":
-            MessageLookupByLibrary.simpleMessage("您的角色和职责"),
-        "yy_home_accounts": MessageLookupByLibrary.simpleMessage("YY Home 账户")
-      };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
 }

+ 1 - 296
packages/cs_resources/lib/generated/intl/messages_zh_HK.dart

@@ -20,301 +20,6 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'zh_HK';
 
-  static String m0(time) => "批准于${time}";
-
-  static String m1(name) => "${name} 已预定";
-
-  static String m2(count) => "${count} 字符";
-
-  static String m3(time) => "处理于${time}";
-
-  static String m4(count, date) => "你还剩余${count}次的配额 (重置于${date})";
-
-  static String m5(time) => "提交于${time}";
-
-  static String m6(name) => "欢迎你 ${name}";
-
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "access_card_desc": MessageLookupByLibrary.simpleMessage(
-            "请输入故障损坏或丢失的门禁卡号的序列号,或提供所有可用门禁卡的序列号。"),
-        "access_card_owner": MessageLookupByLibrary.simpleMessage("业主门禁卡"),
-        "access_card_tenant": MessageLookupByLibrary.simpleMessage("租户门禁卡"),
-        "access_card_tenant_letter":
-            MessageLookupByLibrary.simpleMessage("请附上业主授权书副本"),
-        "access_date": MessageLookupByLibrary.simpleMessage("访问日期"),
-        "account_deactivate_alert": MessageLookupByLibrary.simpleMessage(
-            "您确定要停用您的帐户吗?一旦您继续执行请求,您将无法登录应用程序。"),
-        "account_deactivation": MessageLookupByLibrary.simpleMessage("删除账号"),
-        "active": MessageLookupByLibrary.simpleMessage("可用"),
-        "add": MessageLookupByLibrary.simpleMessage("添加"),
-        "add_card": MessageLookupByLibrary.simpleMessage("添加银行卡"),
-        "add_new_card": MessageLookupByLibrary.simpleMessage("添加新卡"),
-        "administrator_reply": MessageLookupByLibrary.simpleMessage("管理员回复"),
-        "agree_to": MessageLookupByLibrary.simpleMessage("同意"),
-        "alert": MessageLookupByLibrary.simpleMessage("提示"),
-        "apply": MessageLookupByLibrary.simpleMessage("可申请"),
-        "approved": MessageLookupByLibrary.simpleMessage("已批准"),
-        "approved_on_sometime": m0,
-        "attachments": MessageLookupByLibrary.simpleMessage("附件"),
-        "back_home": MessageLookupByLibrary.simpleMessage("返回首页"),
-        "bicycle_desc": MessageLookupByLibrary.simpleMessage("请上传您的自行车照片"),
-        "bicycle_note":
-            MessageLookupByLibrary.simpleMessage("请注明自行车的型号、品牌、颜色和自行车类型。"),
-        "block": MessageLookupByLibrary.simpleMessage("街区"),
-        "block_desc": MessageLookupByLibrary.simpleMessage("街区是指单位官方邮编街道号"),
-        "block_example":
-            MessageLookupByLibrary.simpleMessage("123 示例路 #08-08 国家 123456"),
-        "block_example_desc":
-            MessageLookupByLibrary.simpleMessage("123 是街区地址邮编 #08-08 是单元号码"),
-        "book": MessageLookupByLibrary.simpleMessage("预定"),
-        "booked_by_someone": m1,
-        "booking_fee": MessageLookupByLibrary.simpleMessage("预定费用"),
-        "booking_successful": MessageLookupByLibrary.simpleMessage("预定成功"),
-        "cancel": MessageLookupByLibrary.simpleMessage("取消"),
-        "car_cancel_signature_txt": MessageLookupByLibrary.simpleMessage(
-            "居民在此确认,我们已阅读并将完全遵守Parc Life的停车规则和规定。我们进一步承诺,在Parc Life期间,我们将始终在车辆前挡风玻璃的左上角(乘客侧)突出显示停车场标签。"),
-        "car_cancel_txt": MessageLookupByLibrary.simpleMessage("请提供以下信息。"),
-        "car_cancel_txt_1": MessageLookupByLibrary.simpleMessage("1.车辆序列号"),
-        "car_cancel_txt_2": MessageLookupByLibrary.simpleMessage("2.车位取消的实施日期"),
-        "car_park_cancellation": MessageLookupByLibrary.simpleMessage("取消停车位"),
-        "card_caps": MessageLookupByLibrary.simpleMessage("信用卡"),
-        "card_number": MessageLookupByLibrary.simpleMessage("银行卡号"),
-        "change": MessageLookupByLibrary.simpleMessage("更换"),
-        "change_mobile_phone": MessageLookupByLibrary.simpleMessage("修改手机号码"),
-        "characters": m2,
-        "choose_an_option": MessageLookupByLibrary.simpleMessage("选择一个选项"),
-        "choose_category": MessageLookupByLibrary.simpleMessage("选择类型"),
-        "community": MessageLookupByLibrary.simpleMessage("社区"),
-        "company_address": MessageLookupByLibrary.simpleMessage("公司地址"),
-        "confirm": MessageLookupByLibrary.simpleMessage("确认"),
-        "confirm_new_password": MessageLookupByLibrary.simpleMessage("确认新密码"),
-        "confirm_password": MessageLookupByLibrary.simpleMessage("确认密码"),
-        "convert_large_recurring_payments_to":
-            MessageLookupByLibrary.simpleMessage("将大额的经常性消费转换为"),
-        "create_new_feedback": MessageLookupByLibrary.simpleMessage("创建新的反馈"),
-        "create_new_yy_home_account":
-            MessageLookupByLibrary.simpleMessage("创建新的 YY Home 账户"),
-        "credit_debit_card": MessageLookupByLibrary.simpleMessage("信用卡或借记卡"),
-        "date_of_entry": MessageLookupByLibrary.simpleMessage("进入日期"),
-        "delete": MessageLookupByLibrary.simpleMessage("删除"),
-        "deposit": MessageLookupByLibrary.simpleMessage("押金"),
-        "deposit_amount": MessageLookupByLibrary.simpleMessage("押金总金额"),
-        "deposit_desc": MessageLookupByLibrary.simpleMessage("押金详情描述:"),
-        "deposit_desc_txt": MessageLookupByLibrary.simpleMessage(
-            "押金是使用社区服务的一部分,在使用服务后,它将自动发放到您相应的银行卡上。请仔细检查"),
-        "deposit_hold": MessageLookupByLibrary.simpleMessage("当前押金"),
-        "deposit_released": MessageLookupByLibrary.simpleMessage("押金已退还"),
-        "deposit_released_caps": MessageLookupByLibrary.simpleMessage("押金已退还"),
-        "describe_your_feedback":
-            MessageLookupByLibrary.simpleMessage("描述您的反馈"),
-        "did_not_receive": MessageLookupByLibrary.simpleMessage("没有收到验证码?"),
-        "edit_profile": MessageLookupByLibrary.simpleMessage("编辑个人信息"),
-        "email": MessageLookupByLibrary.simpleMessage("邮箱"),
-        "enable_notification": MessageLookupByLibrary.simpleMessage("允许通知"),
-        "end_date_caps": MessageLookupByLibrary.simpleMessage("结束时间"),
-        "estate": MessageLookupByLibrary.simpleMessage("房产"),
-        "estate_name_desc":
-            MessageLookupByLibrary.simpleMessage("告诉我们您申请的公寓楼的名称"),
-        "estate_or_building_name":
-            MessageLookupByLibrary.simpleMessage("房产或建筑名称?"),
-        "facility": MessageLookupByLibrary.simpleMessage("設施"),
-        "facility_active": MessageLookupByLibrary.simpleMessage("可用"),
-        "fee_paid": MessageLookupByLibrary.simpleMessage("已支付"),
-        "feedback": MessageLookupByLibrary.simpleMessage("反馈"),
-        "feedback_details": MessageLookupByLibrary.simpleMessage("反馈详情"),
-        "feedback_msg_1": MessageLookupByLibrary.simpleMessage("帮助我们保持您的房产美丽"),
-        "feedback_msg_2": MessageLookupByLibrary.simpleMessage(
-            "有些事情需要我们关注,或者如果你有一个很棒的建议,我们想听听你的意见!"),
-        "first_name": MessageLookupByLibrary.simpleMessage("名"),
-        "followers": MessageLookupByLibrary.simpleMessage("粉丝"),
-        "following": MessageLookupByLibrary.simpleMessage("关注"),
-        "forgot_password": MessageLookupByLibrary.simpleMessage("忘记密码?"),
-        "forgot_text": MessageLookupByLibrary.simpleMessage("请输入您的邮箱和手机号码"),
-        "form": MessageLookupByLibrary.simpleMessage("表單"),
-        "form_submit_title": MessageLookupByLibrary.simpleMessage("已提交"),
-        "full_name": MessageLookupByLibrary.simpleMessage("全名"),
-        "get_code": MessageLookupByLibrary.simpleMessage("获取验证码"),
-        "get_started": MessageLookupByLibrary.simpleMessage("让我们开始吧"),
-        "guest_mobile_number": MessageLookupByLibrary.simpleMessage("访客手机号码"),
-        "guest_name": MessageLookupByLibrary.simpleMessage("访客姓名"),
-        "hacking_end_date": MessageLookupByLibrary.simpleMessage("施工结束日期"),
-        "hacking_start_date": MessageLookupByLibrary.simpleMessage("施工开始日期"),
-        "have_fun": MessageLookupByLibrary.simpleMessage("祝您愉快!"),
-        "history": MessageLookupByLibrary.simpleMessage("历史记录"),
-        "home": MessageLookupByLibrary.simpleMessage("首页"),
-        "household": MessageLookupByLibrary.simpleMessage("家庭"),
-        "household_members": MessageLookupByLibrary.simpleMessage("家庭成员"),
-        "in_progress": MessageLookupByLibrary.simpleMessage("处理中"),
-        "inactive": MessageLookupByLibrary.simpleMessage("不可用"),
-        "info": MessageLookupByLibrary.simpleMessage("咨询"),
-        "info_desc1": MessageLookupByLibrary.simpleMessage(
-            "立即将您的经常性消费转换为有价值的里程、奖励和现金返还!"),
-        "info_desc2": MessageLookupByLibrary.simpleMessage("商务舱便宜60%!"),
-        "info_desc3": MessageLookupByLibrary.simpleMessage(
-            "Sundy用信用卡支付MCST费用,以帮助她积累62000美元的年度支出。一切加起来!"),
-        "info_desc4": MessageLookupByLibrary.simpleMessage(
-            "她的信用卡每消费一美元就奖励她1.5英里*,为她赚取93000英里。"),
-        "info_desc5": MessageLookupByLibrary.simpleMessage(
-            "Sundy能够乘坐价值4000美元的商务舱前往东京,只需支付1488美元的YY Home Pay处理费,节省了60%以上!"),
-        "info_desc6": MessageLookupByLibrary.simpleMessage("请查看您的信用卡奖励以获取更多信息"),
-        "internal": MessageLookupByLibrary.simpleMessage("内部"),
-        "introduction_to_info_pack":
-            MessageLookupByLibrary.simpleMessage("信息介绍"),
-        "iu_number": MessageLookupByLibrary.simpleMessage("IU 编号"),
-        "label_replace_note": MessageLookupByLibrary.simpleMessage(
-            "如果您想在申请时给管理层留一张便条,请在此处留下。\n\n更换汽车标签时,请附上损坏汽车标签的序列号。"),
-        "label_txt": MessageLookupByLibrary.simpleMessage("请随车辆登记表附上以下文件:"),
-        "label_txt_1": MessageLookupByLibrary.simpleMessage("1)一张机动车登记或日志卡"),
-        "label_txt_2": MessageLookupByLibrary.simpleMessage("2)公司车辆需要公司授权书"),
-        "label_txt_3": MessageLookupByLibrary.simpleMessage("3)租车需要租车协议。"),
-        "last_name": MessageLookupByLibrary.simpleMessage("姓"),
-        "latest_news": MessageLookupByLibrary.simpleMessage("最新消息"),
-        "latest_transactions": MessageLookupByLibrary.simpleMessage("最新交易"),
-        "license_plate_number": MessageLookupByLibrary.simpleMessage("车牌号"),
-        "list_of_renovation_works":
-            MessageLookupByLibrary.simpleMessage("装修工程清单"),
-        "login": MessageLookupByLibrary.simpleMessage("登录"),
-        "logout": MessageLookupByLibrary.simpleMessage("退出登录"),
-        "logout_alert": MessageLookupByLibrary.simpleMessage("你确定要退出登录吗?"),
-        "mark_all": MessageLookupByLibrary.simpleMessage("标记全部"),
-        "me": MessageLookupByLibrary.simpleMessage("我的"),
-        "mobile_number_caps": MessageLookupByLibrary.simpleMessage("手机号码"),
-        "mobile_phone": MessageLookupByLibrary.simpleMessage("手机号码"),
-        "moving_in": MessageLookupByLibrary.simpleMessage("搬入"),
-        "moving_in_msg": MessageLookupByLibrary.simpleMessage(
-            "如果您想在申请时给管理层留一张便条或有任何特殊要求,请在此处留下。"),
-        "moving_out": MessageLookupByLibrary.simpleMessage("搬出"),
-        "my_post": MessageLookupByLibrary.simpleMessage("我的发布"),
-        "name_on_card": MessageLookupByLibrary.simpleMessage("银行卡姓名"),
-        "new_mobile_phone": MessageLookupByLibrary.simpleMessage("新的手机号码"),
-        "new_password": MessageLookupByLibrary.simpleMessage("新密码"),
-        "next": MessageLookupByLibrary.simpleMessage("下一步"),
-        "no": MessageLookupByLibrary.simpleMessage("否"),
-        "not_approved": MessageLookupByLibrary.simpleMessage("未批准"),
-        "not_approved_on_sometime": m3,
-        "notes": MessageLookupByLibrary.simpleMessage("备注"),
-        "notes_to_management": MessageLookupByLibrary.simpleMessage("给管理员备注"),
-        "notes_to_recipient": MessageLookupByLibrary.simpleMessage("收款人通知"),
-        "notice_board": MessageLookupByLibrary.simpleMessage("通知板"),
-        "notification": MessageLookupByLibrary.simpleMessage("通知"),
-        "nric_fin": MessageLookupByLibrary.simpleMessage("身份证/签证"),
-        "old_mobile_phone": MessageLookupByLibrary.simpleMessage("旧的手机号码"),
-        "on_hold": MessageLookupByLibrary.simpleMessage("持有"),
-        "or": MessageLookupByLibrary.simpleMessage("或者"),
-        "other": MessageLookupByLibrary.simpleMessage("其他"),
-        "overnight_parking": MessageLookupByLibrary.simpleMessage("通宵停车"),
-        "overnight_parking_msg":
-            MessageLookupByLibrary.simpleMessage("请提供过夜停车时间。"),
-        "ownership_status": MessageLookupByLibrary.simpleMessage("所有权状态"),
-        "paid_on": MessageLookupByLibrary.simpleMessage("付款时间"),
-        "password": MessageLookupByLibrary.simpleMessage("密码"),
-        "password_format": MessageLookupByLibrary.simpleMessage("8位数字或字母"),
-        "pay_fees_with": MessageLookupByLibrary.simpleMessage("支付MCST费用"),
-        "payment": MessageLookupByLibrary.simpleMessage("支付"),
-        "payment_details": MessageLookupByLibrary.simpleMessage("支付详情"),
-        "phone_email": MessageLookupByLibrary.simpleMessage("电话或邮箱"),
-        "primary_card": MessageLookupByLibrary.simpleMessage("主卡"),
-        "privacy_policy": MessageLookupByLibrary.simpleMessage("隐私协议"),
-        "proceed_with_payment": MessageLookupByLibrary.simpleMessage("继续付款"),
-        "processing_in_progress":
-            MessageLookupByLibrary.simpleMessage("正在处理中,请耐心等待..."),
-        "property": MessageLookupByLibrary.simpleMessage("房产"),
-        "property_guide": MessageLookupByLibrary.simpleMessage("物业指南"),
-        "property_news": MessageLookupByLibrary.simpleMessage("资产新闻"),
-        "publish": MessageLookupByLibrary.simpleMessage("公布"),
-        "published_successful_txt":
-            MessageLookupByLibrary.simpleMessage("您的反馈已发送成功,我们会尽快回复您的反馈,谢谢!"),
-        "published_successfully": MessageLookupByLibrary.simpleMessage("发布成功"),
-        "quota_left_msg": m4,
-        "rate_us": MessageLookupByLibrary.simpleMessage("评价我们"),
-        "re_registration_of_1_vehicle_owner":
-            MessageLookupByLibrary.simpleMessage("业主第一辆车重新登记"),
-        "re_registration_of_1_vehicle_tenant":
-            MessageLookupByLibrary.simpleMessage("租户第一辆车重新登记"),
-        "re_registration_of_bicycle":
-            MessageLookupByLibrary.simpleMessage("自行车重新登记"),
-        "registration_of_2_vehicle":
-            MessageLookupByLibrary.simpleMessage("第二辆车登记"),
-        "remove": MessageLookupByLibrary.simpleMessage("移除"),
-        "remove_account": MessageLookupByLibrary.simpleMessage("移除账号"),
-        "remove_account_tips":
-            MessageLookupByLibrary.simpleMessage("你确定要移除你的账号吗?"),
-        "renovation": MessageLookupByLibrary.simpleMessage("装修"),
-        "renovation_attachments": MessageLookupByLibrary.simpleMessage(
-            "为协助我们批准您的申请,请附上以下文件:\n\n1.拟建装修平面图及图纸\n\n2.专业工程师认可\n\n3.电气布置\n\n4.业主和承包商的共同赔偿"),
-        "renovation_end_date": MessageLookupByLibrary.simpleMessage("装修结束日期"),
-        "renovation_note": MessageLookupByLibrary.simpleMessage(
-            "请列出参与您装修的所有其他分包商。\n\n如果您想在提交此申请时给管理层留言或有任何特殊要求,请在此处留言。"),
-        "renovation_start_date": MessageLookupByLibrary.simpleMessage("装修开始日期"),
-        "resend_code": MessageLookupByLibrary.simpleMessage("重新发送"),
-        "reset_password": MessageLookupByLibrary.simpleMessage("重置密码"),
-        "rewards": MessageLookupByLibrary.simpleMessage("獎勵"),
-        "send_feedback": MessageLookupByLibrary.simpleMessage("发送反馈"),
-        "send_feedback_management":
-            MessageLookupByLibrary.simpleMessage("如果您想了解更多信息,请向管理层发送反馈"),
-        "send_on_sometime": m5,
-        "sent": MessageLookupByLibrary.simpleMessage("发送"),
-        "service": MessageLookupByLibrary.simpleMessage("服务"),
-        "set_primary_card": MessageLookupByLibrary.simpleMessage("设为主卡"),
-        "settings": MessageLookupByLibrary.simpleMessage("设置"),
-        "sign_up_success_txt1":
-            MessageLookupByLibrary.simpleMessage("您已成功创建 YYHome 的帐户"),
-        "sign_up_success_txt2":
-            MessageLookupByLibrary.simpleMessage("您的用户名是您的电子邮件地址,请保护您的密码安全"),
-        "sign_up_success_txt3":
-            MessageLookupByLibrary.simpleMessage("现在,让我们把你和你的社区关联起来"),
-        "sign_up_verify_txt":
-            MessageLookupByLibrary.simpleMessage("我们已经向您发送了短信验证码,请在下面输入"),
-        "signature": MessageLookupByLibrary.simpleMessage("签名"),
-        "signed_and_agreed_by": MessageLookupByLibrary.simpleMessage("签字并同意"),
-        "start_date_caps": MessageLookupByLibrary.simpleMessage("开始时间"),
-        "status": MessageLookupByLibrary.simpleMessage("状态"),
-        "strata_management_guides":
-            MessageLookupByLibrary.simpleMessage("管理手册"),
-        "submit": MessageLookupByLibrary.simpleMessage("提交"),
-        "terms_conditions": MessageLookupByLibrary.simpleMessage("服务条款"),
-        "terms_of_service": MessageLookupByLibrary.simpleMessage("服务条款"),
-        "time_of_arrival": MessageLookupByLibrary.simpleMessage("到达时间"),
-        "title": MessageLookupByLibrary.simpleMessage("标题"),
-        "total": MessageLookupByLibrary.simpleMessage("共计"),
-        "tries_left": MessageLookupByLibrary.simpleMessage("次尝试机会"),
-        "type_here": MessageLookupByLibrary.simpleMessage("在此输入"),
-        "type_of_application": MessageLookupByLibrary.simpleMessage("申请类型"),
-        "unit_number": MessageLookupByLibrary.simpleMessage("单元"),
-        "up_to_max_images":
-            MessageLookupByLibrary.simpleMessage("(您最多可以上传10张图片)"),
-        "upload": MessageLookupByLibrary.simpleMessage("上传"),
-        "upload_a_photo": MessageLookupByLibrary.simpleMessage("上传照片"),
-        "upload_doc_desc": MessageLookupByLibrary.simpleMessage(
-            "管理员要求您上传以下文件以验证您的租约。您可以编辑敏感的财务信息"),
-        "upload_doc_desc1": MessageLookupByLibrary.simpleMessage(
-            "(1)一份有效的租赁协议,显示您的姓名、单位编号、租赁到期日期和居住者名单(如果适用)"),
-        "upload_doc_desc2":
-            MessageLookupByLibrary.simpleMessage("(2)租赁协议印花税收据"),
-        "upload_documents": MessageLookupByLibrary.simpleMessage("上传文档"),
-        "upload_pictures": MessageLookupByLibrary.simpleMessage("上传图片"),
-        "vehicle_label_replacement":
-            MessageLookupByLibrary.simpleMessage("车辆标签更换"),
-        "vehicle_make_model_colour":
-            MessageLookupByLibrary.simpleMessage("车辆品牌/型号/颜色"),
-        "vehicle_number": MessageLookupByLibrary.simpleMessage("车牌号"),
-        "verification_code": MessageLookupByLibrary.simpleMessage("验证码"),
-        "version_no": MessageLookupByLibrary.simpleMessage("版本号."),
-        "view": MessageLookupByLibrary.simpleMessage("查看"),
-        "visitor": MessageLookupByLibrary.simpleMessage("访客"),
-        "visitor_active": MessageLookupByLibrary.simpleMessage("可用的"),
-        "visitor_msg": MessageLookupByLibrary.simpleMessage(
-            "社区访客系统是一个智能系统,旨在加强社区安全管理,方便访客访问。"),
-        "visitor_now": MessageLookupByLibrary.simpleMessage("当前的"),
-        "visitor_registration": MessageLookupByLibrary.simpleMessage("访客登记"),
-        "waiting_for_the_administrator":
-            MessageLookupByLibrary.simpleMessage("等待管理员回复"),
-        "welcome_name": m6,
-        "yes": MessageLookupByLibrary.simpleMessage("是"),
-        "you_have": MessageLookupByLibrary.simpleMessage("你还有"),
-        "your_roles_responsibilities":
-            MessageLookupByLibrary.simpleMessage("您的角色和职责"),
-        "yy_home_accounts": MessageLookupByLibrary.simpleMessage("YY Home 账户")
-      };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
 }

+ 30 - 0
packages/cs_resources/lib/generated/l10n.dart

@@ -2660,6 +2660,36 @@ class S {
     );
   }
 
+  /// `Enter CAPTCHA`
+  String get enter_captcha {
+    return Intl.message(
+      'Enter CAPTCHA',
+      name: 'enter_captcha',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `CAPTCHA`
+  String get captcha {
+    return Intl.message(
+      'CAPTCHA',
+      name: 'captcha',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Rejected`
+  String get rejected {
+    return Intl.message(
+      'Rejected',
+      name: 'rejected',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Other`
   String get other {
     return Intl.message(

+ 3 - 0
packages/cs_resources/lib/l10n/intl_en.arb

@@ -260,5 +260,8 @@
   "view_application": "View Application",
   "serial_number": "Serial Number",
   "processing": "Processing",
+  "enter_captcha": "Enter CAPTCHA",
+  "captcha": "CAPTCHA",
+  "rejected": "Rejected",
   "other": "Other"
 }

+ 3 - 0
packages/cs_resources/lib/l10n/intl_zh_CN.arb

@@ -260,5 +260,8 @@
   "view_application": "查看记录",
   "serial_number": "序列号",
   "processing": "处理中",
+  "enter_captcha": "输入验证码",
+  "captcha": "验证码",
+  "rejected": "已拒绝",
   "other": "其他"
 }

+ 3 - 0
packages/cs_resources/lib/l10n/intl_zh_HK.arb

@@ -246,5 +246,8 @@
   "view_application": "查看记录",
   "serial_number": "序列号",
   "processing": "处理中",
+  "enter_captcha": "输入验证码",
+  "captcha": "验证码",
+  "rejected": "已拒绝",
   "other": "其他"
 }

+ 12 - 1
packages/cs_resources/lib/theme/app_colors_theme.dart

@@ -34,6 +34,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
   static const _colorE9E9E9 = Color(0xFFE9E9E9);
   static const _color99A8CA = Color(0xFF99A8CA);
   static const _color0DBE1E= Color(0xFF0DBE1E);
+  static const _color05CC67= Color(0xFF05CC67);
 
   //暗色主题的一些自定义颜色值
   static const _darkBlackBg = Color(0xFF0F0F0F);
@@ -46,6 +47,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
   // 页面中真正使用到的颜色名称
   final Color backgroundDefault; //页面背景颜色(偏白)
   final Color backgroundDark; //页面背景颜色(蓝灰蓝)
+  final Color backgroundWhite; //页面背景颜色(白色)
   final Color btnBgDefault; //按钮背景颜色
   final Color searchFiledBorder; //搜索框的边框颜色
   final Color authFiledHint; //输入框默认的提示文本颜色
@@ -78,11 +80,13 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
   final Color disEnableGray; //禁用的灰色
   final Color authFiledHintDark; //文本Hint的深蓝色
   final Color greenBG; //按钮的绿色背景
+  final Color textGreen; //按钮的绿色背景
 
   // 私有的构造函数
   const AppColorsTheme._internal({
     required this.backgroundDefault,
     required this.backgroundDark,
+    required this.backgroundWhite,
     required this.btnBgDefault,
     required this.searchFiledBorder,
     required this.authFiledHint,
@@ -115,6 +119,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
     required this.disEnableGray,
     required this.authFiledHintDark,
     required this.greenBG,
+    required this.textGreen,
   });
 
   // 浅色主题工厂方法
@@ -122,6 +127,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
     return const AppColorsTheme._internal(
       backgroundDefault: _colorFCFCFC,
       backgroundDark: _colorF2F3F6,
+      backgroundWhite: Colors.white,
       btnBgDefault: _colorPrimary,
       searchFiledBorder: _colorD7DBE7,
       authFiledHint: _colorBDBDBD,
@@ -154,6 +160,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
       disEnableGray: _colorBDBDBD,
       authFiledHintDark: _color99A8CA,
       greenBG: _color0DBE1E,
+      textGreen: _color05CC67,
     );
   }
 
@@ -162,6 +169,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
     return const AppColorsTheme._internal(
       backgroundDefault: _darkBlackBg,
       backgroundDark: _darkBlackBg,
+      backgroundWhite: _darkBlackBg,
       btnBgDefault: _darkBlackItem,
       searchFiledBorder: _darkBlackItem,
       authFiledHint: _colorD7DBE7,
@@ -178,7 +186,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
       tabTextUnSelectedPrimary: Colors.white,
       imgGrayBg: _darkBlackItem,
       textDarkGray999: Colors.white,
-      whiteBG: _darkBlackBg,
+      whiteBG: _darkBlackItem,
       whiteSecondBG: _darkBlackItemLight,
       redDefault: _darkBlackItem,
       dividerDefault: _darkBlackItemDivider,
@@ -194,6 +202,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
       disEnableGray: _darkBlackItemLight,
       authFiledHintDark: _color99A8CA,
       greenBG: _darkBlackItemLight,
+      textGreen: Colors.white,
     );
   }
 
@@ -211,6 +220,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
     return AppColorsTheme._internal(
       backgroundDefault: Color.lerp(backgroundDefault, other.backgroundDefault, t)!,
       backgroundDark: Color.lerp(backgroundDark, other.backgroundDark, t)!,
+      backgroundWhite: Color.lerp(backgroundWhite, other.backgroundWhite, t)!,
       btnBgDefault: Color.lerp(btnBgDefault, other.btnBgDefault, t)!,
       searchFiledBorder: Color.lerp(searchFiledBorder, other.searchFiledBorder, t)!,
       authFiledHint: Color.lerp(authFiledHint, other.authFiledHint, t)!,
@@ -243,6 +253,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
       disEnableGray: Color.lerp(disEnableGray, other.disEnableGray, t)!,
       authFiledHintDark: Color.lerp(authFiledHintDark, other.authFiledHintDark, t)!,
       greenBG: Color.lerp(greenBG, other.greenBG, t)!,
+      textGreen: Color.lerp(textGreen, other.textGreen, t)!,
     );
   }
 }

+ 181 - 0
packages/cs_widgets/lib/dialog/verify_code_dialog.dart

@@ -0,0 +1,181 @@
+import 'package:cs_resources/generated/assets.dart';
+import 'package:cs_resources/generated/l10n.dart';
+import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:widgets/ext/ex_widget.dart';
+import 'package:widgets/my_load_image.dart';
+import '../my_text_field.dart';
+import '../my_text_view.dart';
+import 'dart:ui';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/widgets.dart';
+import 'package:widgets/widget_export.dart';
+
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+/*
+ * 验证码校验弹窗,输入四位数的验证才能发送短信
+ */
+class VerifyCodeDialog extends HookConsumerWidget {
+  void Function(String key, String code) confirmAction;
+
+  VerifyCodeDialog({
+    required this.confirmAction,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    // 使用 useState 来持久化 TextEditingController 和 FocusNode
+    final textEditingController = useTextEditingController();
+    final focusNode = useFocusNode();
+
+    useEffect(() {
+      //赋值State的值
+      Future.microtask(() {});
+
+      return () {
+        // 释放控制器资源
+        textEditingController.dispose();
+        focusNode.dispose();
+      };
+    }, []);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        //Title (如果使用 Container 为最外层容器则默认为 match_parent 的效果,除非我们限制宽度和最大高度最小高度)
+        Container(
+          width: double.infinity,
+          height: 55,
+          decoration: BoxDecoration(
+            color: context.appColors.btnBgDefault,
+            borderRadius: const BorderRadius.only(
+              topRight: Radius.circular(15),
+              topLeft: Radius.circular(15),
+            ),
+          ),
+          child: Row(
+            children: [
+              const SizedBox(width: 45),
+              MyTextView(
+                S.current.captcha,
+                fontSize: 18,
+                textAlign: TextAlign.center,
+                isFontMedium: true,
+                textColor: Colors.white,
+              ).expanded(),
+              const MyAssetImage(
+                Assets.baseServiceDialogDeleteIcon,
+                width: 25,
+                height: 25.5,
+              ).onTap(() {
+                onCancel();
+              }, padding: 10)
+            ],
+          ),
+        ),
+
+        Container(
+          width: double.infinity,
+          padding: const EdgeInsets.only(top: 40),
+          decoration: BoxDecoration(
+            color: context.appColors.whiteSecondBG,
+            borderRadius: const BorderRadius.only(
+              bottomLeft: Radius.circular(15),
+              bottomRight: Radius.circular(15),
+            ),
+          ),
+          child: Column(
+            children: [
+              //图片与输入框
+              Row(
+                mainAxisSize: MainAxisSize.max,
+                children: [
+                  IgnoreKeyboardDismiss(
+                    child: MyTextField(
+                      'code',
+                      "",
+                      enabled: true,
+                      fillCornerRadius: 1,
+                      padding: const EdgeInsets.symmetric(horizontal: 10),
+                      fillBackgroundColor: context.appColors.authFiledBG,
+                      border: InputBorder.none,
+                      showDivider: false,
+                      hintText: S.current.enter_captcha,
+                      hintStyle: TextStyle(
+                        color: context.appColors.authFiledHint,
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                      ),
+                      controller: textEditingController,
+                      focusNode: focusNode,
+                      style: TextStyle(
+                        color: context.appColors.authFiledText,
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                      ),
+                      height: 48,
+                      cursorWidth: 1.5,
+                      cursorColor: context.appColors.authFiledText,
+                      margin: const EdgeInsets.only(right: 5),
+                      onSubmit: (formKey, value) {
+                        focusNode.unfocus();
+                        onCancel();
+                        confirmAction.call("key", textEditingController.text.toString());
+                      },
+                    ),
+                  ).expanded(),
+
+                  //图片验证码
+                  MyLoadImage(
+                    'https://img0.baidu.com/it/u=3528227727,3536117093&fm=253&fmt=auto&app=138&f=JPEG?w=395&h=200',
+                    width: 100,
+                    height: 45,
+                    fit: BoxFit.fill,
+                    onClick: () {
+                      //刷新验证码
+                    },
+                  ),
+                ],
+              ).marginOnly(left: 15, right: 15),
+
+              //按钮获取验证码
+              Row(
+                children: [
+                  InkWell(
+                    onTap: () async {
+                      focusNode.unfocus();
+                      onCancel();
+                      confirmAction.call("key", textEditingController.text.toString());
+                    },
+                    child: MyTextView(
+                      S.current.get_code,
+                      fontSize: 16,
+                      paddingTop: 13,
+                      paddingBottom: 13,
+                      isFontMedium: true,
+                      textAlign: TextAlign.center,
+                      textColor: Colors.white,
+                      backgroundColor: context.appColors.btnBgDefault,
+                      cornerRadius: 7,
+                    ),
+                  ).expanded(),
+                ],
+              ).marginOnly(bottom: 30, top: 28, left: 15, right: 15),
+            ],
+          ),
+        ),
+      ],
+    ).constrained(width: 300)
+    //跟随软键盘滚动,适配居中于剩余的空间
+        .padding(bottom: MediaQuery.of(context).viewInsets.bottom);
+  }
+
+  //取消弹框
+  void onCancel() async {
+    SmartDialog.dismiss();
+  }
+}

+ 2 - 1
packages/cs_widgets/lib/widget_export.dart

@@ -6,4 +6,5 @@ export 'package:easy_refresh/easy_refresh.dart';
 export 'package:flutter_html/flutter_html.dart';
 export 'package:webview_flutter/webview_flutter.dart';
 export 'package:hand_signature/signature.dart';
-export 'shatter/weekly_calendar/weekly_calendar.dart';
+export 'shatter/weekly_calendar/weekly_calendar.dart';
+export 'dialog/verify_code_dialog.dart';