Procházet zdrojové kódy

首页的接口调试与信息展示
facility的resource的逻辑

liukai před 2 měsíci
rodič
revize
7bd9fd5345
62 změnil soubory, kde provedl 1302 přidání a 870 odebrání
  1. 18 19
      packages/cpt_facility/lib/modules/booking/facility_booking_page.dart
  2. 1 1
      packages/cpt_facility/lib/modules/booking/facility_booking_view_model.dart
  3. 1 1
      packages/cpt_facility/lib/modules/booking/facility_booking_view_model.g.dart
  4. 1 1
      packages/cpt_facility/lib/modules/detail/facility_detail_view_model.g.dart
  5. 1 2
      packages/cpt_facility/lib/modules/facility/book/facility_book_screen.dart
  6. 1 1
      packages/cpt_facility/lib/modules/facility/book/facility_book_view_model.g.dart
  7. 1 0
      packages/cpt_facility/lib/router/page/facility_page_router.dart
  8. 6 12
      packages/cpt_facility/lib/router/page/facility_page_router.gr.dart
  9. 152 75
      packages/cpt_main/lib/modules/home/home_page.dart
  10. 102 95
      packages/cpt_main/lib/modules/home/home_state.dart
  11. 43 3
      packages/cpt_main/lib/modules/home/home_view_model.dart
  12. 16 15
      packages/cpt_main/lib/modules/home/item_home_last_trans.dart
  13. 6 3
      packages/cpt_main/lib/modules/home/item_home_property_news.dart
  14. 9 1
      packages/cs_domain/lib/constants/api_constants.dart
  15. 13 11
      packages/cs_domain/lib/entity/facility_index_entity.dart
  16. 84 0
      packages/cs_domain/lib/entity/home_list_entity.dart
  17. 27 0
      packages/cs_domain/lib/entity/latest_news_detail_entity.dart
  18. 48 0
      packages/cs_domain/lib/entity/latest_news_page_entity.dart
  19. 137 213
      packages/cs_domain/lib/generated/json/base/json_convert_content.dart
  20. 14 31
      packages/cs_domain/lib/generated/json/facility_book_entity.g.dart
  21. 9 1
      packages/cs_domain/lib/generated/json/facility_index_entity.g.dart
  22. 20 40
      packages/cs_domain/lib/generated/json/facility_page_entity.g.dart
  23. 6 14
      packages/cs_domain/lib/generated/json/feedback_detail_entity.g.dart
  24. 3 7
      packages/cs_domain/lib/generated/json/feedback_list_entity.g.dart
  25. 23 46
      packages/cs_domain/lib/generated/json/form_content_entity.g.dart
  26. 1 2
      packages/cs_domain/lib/generated/json/form_detail_entity.g.dart
  27. 1 2
      packages/cs_domain/lib/generated/json/form_list_entity.g.dart
  28. 2 4
      packages/cs_domain/lib/generated/json/form_option_entity.g.dart
  29. 6 12
      packages/cs_domain/lib/generated/json/form_submitted_entity.g.dart
  30. 4 9
      packages/cs_domain/lib/generated/json/form_submitted_page_entity.g.dart
  31. 5 10
      packages/cs_domain/lib/generated/json/garage_sale_rent_detail_entity.g.dart
  32. 5 11
      packages/cs_domain/lib/generated/json/garage_sale_rent_entity.g.dart
  33. 178 0
      packages/cs_domain/lib/generated/json/home_list_entity.g.dart
  34. 61 0
      packages/cs_domain/lib/generated/json/latest_news_detail_entity.g.dart
  35. 114 0
      packages/cs_domain/lib/generated/json/latest_news_page_entity.g.dart
  36. 2 4
      packages/cs_domain/lib/generated/json/myfollowing_list_entity.g.dart
  37. 7 15
      packages/cs_domain/lib/generated/json/myposts_newsfeed_entity.g.dart
  38. 4 9
      packages/cs_domain/lib/generated/json/myposts_sale_rent_entity.g.dart
  39. 2 4
      packages/cs_domain/lib/generated/json/newsfeed_comment_publish_entity.g.dart
  40. 13 28
      packages/cs_domain/lib/generated/json/newsfeed_detail_entity.g.dart
  41. 9 19
      packages/cs_domain/lib/generated/json/newsfeed_following_entity.g.dart
  42. 5 11
      packages/cs_domain/lib/generated/json/newsfeed_foryou_entity.g.dart
  43. 5 10
      packages/cs_domain/lib/generated/json/newsfeed_news_entity.g.dart
  44. 2 4
      packages/cs_domain/lib/generated/json/notice_board_announ_entity.g.dart
  45. 2 4
      packages/cs_domain/lib/generated/json/notice_board_documents_entity.g.dart
  46. 2 4
      packages/cs_domain/lib/generated/json/notice_board_event_entity.g.dart
  47. 2 4
      packages/cs_domain/lib/generated/json/payment_page_entity.g.dart
  48. 2 4
      packages/cs_domain/lib/generated/json/property_news_detail_entity.g.dart
  49. 2 4
      packages/cs_domain/lib/generated/json/property_news_entity.g.dart
  50. 4 9
      packages/cs_domain/lib/generated/json/property_sale_rent_entity.g.dart
  51. 2 4
      packages/cs_domain/lib/generated/json/rewards_category_entity.g.dart
  52. 2 4
      packages/cs_domain/lib/generated/json/rewards_history_earned_entity.g.dart
  53. 6 14
      packages/cs_domain/lib/generated/json/rewards_home_entity.g.dart
  54. 5 12
      packages/cs_domain/lib/generated/json/rewards_home_tes_entity.g.dart
  55. 2 4
      packages/cs_domain/lib/generated/json/rewards_home_test_entity.g.dart
  56. 5 11
      packages/cs_domain/lib/generated/json/rewards_index_entity.g.dart
  57. 2 4
      packages/cs_domain/lib/generated/json/rewards_list_entity.g.dart
  58. 15 33
      packages/cs_domain/lib/generated/json/user_me_entity.g.dart
  59. 3 6
      packages/cs_domain/lib/generated/json/visitor_page_entity.g.dart
  60. 74 0
      packages/cs_domain/lib/repository/main_repository.dart
  61. 4 2
      packages/cs_plugin_basic/lib/dio_interceptors/interceptor_status_code_dio.dart
  62. 0 1
      packages/cs_widgets/lib/widget_export.dart

+ 18 - 19
packages/cpt_facility/lib/modules/booking/facility_booking_page.dart

@@ -5,6 +5,7 @@ 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:domain/entity/facility_book_entity.dart';
+import 'package:domain/entity/facility_index_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -26,17 +27,16 @@ import 'facility_booking_view_model.dart';
 
 @RoutePage()
 class FacilityBookingPage extends HookConsumerWidget {
-  final String facilityId;
-  final String facilityName;
+  final FacilityIndexEntity facilityEntity;
 
-  const FacilityBookingPage({Key? key, required this.facilityId, required this.facilityName}) : super(key: key);
+  const FacilityBookingPage({Key? key, required this.facilityEntity}) : super(key: key);
 
   //启动当前页面
-  static void startInstance({BuildContext? context, required String facilityId, required String facilityName}) {
+  static void startInstance({BuildContext? context, required FacilityIndexEntity facilityEntity}) {
     if (context != null) {
-      context.router.push(FacilityBookingPageRoute(facilityId: facilityId, facilityName: facilityName));
+      context.router.push(FacilityBookingPageRoute(facilityEntity: facilityEntity));
     } else {
-      appRouter.push(FacilityBookingPageRoute(facilityId: facilityId, facilityName: facilityName));
+      appRouter.push(FacilityBookingPageRoute(facilityEntity: facilityEntity));
     }
   }
 
@@ -48,7 +48,7 @@ class FacilityBookingPage extends HookConsumerWidget {
     useEffect(() {
       // 组件挂载时执行 - 执行接口请求
       Future.microtask(() {
-        viewModel.setFacilityId(facilityId, facilityName);
+        viewModel.setFacilityId(facilityEntity.id, facilityEntity.name);
         viewModel.fetchListByDate();
       });
       return () {
@@ -59,21 +59,20 @@ class FacilityBookingPage extends HookConsumerWidget {
     return Scaffold(
       appBar: MyAppBar.appBar(
         context,
-        facilityName,
+        facilityEntity.name ?? "",
         backgroundColor: context.appColors.backgroundWhite,
         actions: [
           //去设施小区的定位图片
-          const MyAssetImage(
-            Assets.facilityTitleLocationIcon,
-            width: 44,
-            height: 44,
-          ).marginOnly(right: 3).onTap(() {
-            FacilityLocationPage.startInstance(context: context, imageUrls: [
-              "https://mz.eastday.com/63074197.jpeg",
-              "https://t10.baidu.com/it/u=3562774827,189123978&fm=30&app=106&f=PNG?w=640&h=479&s=DFBA6EC80A72B7CC02FC011F0300D0C2",
-              "https://img1.baidu.com/it/u=4090167392,148087489&fm=253&fmt=auto&app=138&f=JPEG?w=484&h=300"
-            ]);
-          }),
+          Visibility(
+            visible: facilityEntity.mapResources.isNotEmpty,
+            child: const MyAssetImage(
+              Assets.facilityTitleLocationIcon,
+              width: 44,
+              height: 44,
+            ).marginOnly(right: 3).onTap(() {
+              FacilityLocationPage.startInstance(context: context, imageUrls: facilityEntity.mapResources);
+            }),
+          )
         ],
       ),
       backgroundColor: context.appColors.backgroundDark,

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

@@ -32,7 +32,7 @@ class FacilityBookingViewModel extends _$FacilityBookingViewModel with DioCancel
   }
 
   //设置设施的ID
-  void setFacilityId(String facilityId, String facilityName) {
+  void setFacilityId(String? facilityId, String? facilityName) {
     state = state.copyWith(facilityId: facilityId, facilityName: facilityName);
   }
 

+ 1 - 1
packages/cpt_facility/lib/modules/booking/facility_booking_view_model.g.dart

@@ -7,7 +7,7 @@ part of 'facility_booking_view_model.dart';
 // **************************************************************************
 
 String _$facilityBookingViewModelHash() =>
-    r'564f4a008b169156b09e3c2325eb1e1cd02e1a47';
+    r'646deef1f63c76e1c0f03d12695d41e0389122d9';
 
 /// See also [FacilityBookingViewModel].
 @ProviderFor(FacilityBookingViewModel)

+ 1 - 1
packages/cpt_facility/lib/modules/detail/facility_detail_view_model.g.dart

@@ -7,7 +7,7 @@ part of 'facility_detail_view_model.dart';
 // **************************************************************************
 
 String _$facilityDetailViewModelHash() =>
-    r'8a361195ada0787beab9b28c38810c95acc51156';
+    r'd026d982cc65cab780f287c0bf91789bc3884202';
 
 /// See also [FacilityDetailViewModel].
 @ProviderFor(FacilityDetailViewModel)

+ 1 - 2
packages/cpt_facility/lib/modules/facility/book/facility_book_screen.dart

@@ -44,8 +44,7 @@ class FacilityBookScreen extends HookConsumerWidget {
                 return FacilityBookItem(index: index, item: state.datas[index]).onTap(() {
                   FacilityBookingPage.startInstance(
                     context: context,
-                    facilityId: state.datas[index].id ?? "",
-                    facilityName: state.datas[index].name ?? "",
+                    facilityEntity: state.datas[index],
                   );
                 });
               },

+ 1 - 1
packages/cpt_facility/lib/modules/facility/book/facility_book_view_model.g.dart

@@ -7,7 +7,7 @@ part of 'facility_book_view_model.dart';
 // **************************************************************************
 
 String _$facilityBookViewModelHash() =>
-    r'a1ae4da61a6245c401083faabca3a6c94b971a4d';
+    r'1424ada4c23a96abadd01134687ecff538650a26';
 
 /// See also [FacilityBookViewModel].
 @ProviderFor(FacilityBookViewModel)

+ 1 - 0
packages/cpt_facility/lib/router/page/facility_page_router.dart

@@ -12,6 +12,7 @@ import '../../modules/detail/facility_detail_page.dart';
 import '../../modules/booking/facility_booking_page.dart';
 import '../../modules/book_confirm/book_confirm_page.dart';
 import '../../modules/location/facility_location_page.dart';
+import 'package:domain/entity/facility_index_entity.dart';
 
 part 'facility_page_router.gr.dart';
 

+ 6 - 12
packages/cpt_facility/lib/router/page/facility_page_router.gr.dart

@@ -39,8 +39,7 @@ abstract class _$FacilityPageRouter extends RootStackRouter {
         routeData: routeData,
         child: FacilityBookingPage(
           key: args.key,
-          facilityId: args.facilityId,
-          facilityName: args.facilityName,
+          facilityEntity: args.facilityEntity,
         ),
       );
     },
@@ -133,15 +132,13 @@ class FacilityBookingPageRoute
     extends PageRouteInfo<FacilityBookingPageRouteArgs> {
   FacilityBookingPageRoute({
     Key? key,
-    required String facilityId,
-    required String facilityName,
+    required FacilityIndexEntity facilityEntity,
     List<PageRouteInfo>? children,
   }) : super(
           FacilityBookingPageRoute.name,
           args: FacilityBookingPageRouteArgs(
             key: key,
-            facilityId: facilityId,
-            facilityName: facilityName,
+            facilityEntity: facilityEntity,
           ),
           initialChildren: children,
         );
@@ -155,19 +152,16 @@ class FacilityBookingPageRoute
 class FacilityBookingPageRouteArgs {
   const FacilityBookingPageRouteArgs({
     this.key,
-    required this.facilityId,
-    required this.facilityName,
+    required this.facilityEntity,
   });
 
   final Key? key;
 
-  final String facilityId;
-
-  final String facilityName;
+  final FacilityIndexEntity facilityEntity;
 
   @override
   String toString() {
-    return 'FacilityBookingPageRouteArgs{key: $key, facilityId: $facilityId, facilityName: $facilityName}';
+    return 'FacilityBookingPageRouteArgs{key: $key, facilityEntity: $facilityEntity}';
   }
 }
 

+ 152 - 75
packages/cpt_main/lib/modules/home/home_page.dart

@@ -2,8 +2,10 @@ import 'package:cpt_main/modules/home/home_state.dart';
 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:domain/entity/home_list_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/src/widgets/framework.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
@@ -13,6 +15,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/widget_export.dart';
 
 import 'item_home_category.dart';
 import 'home_view_model.dart';
@@ -29,6 +32,15 @@ class HomePage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final viewModel = ref.read(homeViewModelProvider.notifier);
     final state = ref.watch(homeViewModelProvider);
+    final bannerIndex = useState(0);
+
+    useEffect(() {
+      // 组件挂载时执行 - 执行接口请求
+      Future.microtask(() => viewModel.fetchHomeIndex());
+      return () {
+        // 组件卸载时执行
+      };
+    }, []);
 
     return Scaffold(
       appBar: MyAppBar.appBar(context, "Good Afternoon,Mike",
@@ -69,64 +81,67 @@ class HomePage extends HookConsumerWidget {
           ],
           showBottomDivider: true),
       backgroundColor: context.appColors.backgroundDefault,
-      body: CustomScrollView(
-        scrollDirection: Axis.vertical,
-        physics: const BouncingScrollPhysics(),
-        slivers: [
-          //支付与奖励
-          _buildPaymentAndRewardsWidget(context, ref),
-
-          //间距
-          _buildSliverSpace(20),
-
-          //九宫选项组 (固定)
-          _buildCategoryWidget(context, ref),
-
-          //轮播图片 (动态)
-          _buildBannerImage(),
-
-          //最新的新闻(动态)
-          _buildLastNews(context, ref),
-
-          //最新的交易
-          SliverToBoxAdapter(
-            child: MyTextView(
-              marginTop: 14,
-              marginLeft: 15,
-              marginBottom: 14,
-              S.current.latest_transactions,
-              textColor: context.appColors.textPrimary,
-              fontSize: 16,
-              isFontMedium: true,
+      body: EasyRefresh(
+        controller: viewModel.refreshController,
+        onRefresh: viewModel.onRefresh,
+        child: CustomScrollView(
+          scrollDirection: Axis.vertical,
+          slivers: [
+            //支付与奖励
+            _buildPaymentAndRewardsWidget(context, ref),
+
+            //间距
+            _buildSliverSpace(20),
+
+            //九宫选项组 (固定)
+            _buildCategoryWidget(context, ref),
+
+            //轮播图片 (动态)
+            _buildBannerImage(ref, bannerIndex),
+
+            //最新的新闻(动态)
+            _buildLastNews(context, ref),
+
+            //最新的交易
+            SliverToBoxAdapter(
+              child: MyTextView(
+                marginTop: 14,
+                marginLeft: 15,
+                marginBottom: 14,
+                S.current.latest_transactions,
+                textColor: context.appColors.textPrimary,
+                fontSize: 16,
+                isFontMedium: true,
+              ),
             ),
-          ),
 
-          //最新交易列表 (动态)
-          _buildLastTransaction(context, state),
-
-          //房产新闻
-          SliverToBoxAdapter(
-            child: MyTextView(
-              marginTop: 14,
-              marginLeft: 15,
-              marginBottom: 14,
-              onClick: viewModel.gotoPropertyNewsPage,
-              S.current.property_news,
-              textColor: context.appColors.textPrimary,
-              fontSize: 16,
-              isFontMedium: true,
+            //最新交易列表 (动态)
+            _buildLastTransaction(context, state),
+
+            //房产新闻
+            SliverToBoxAdapter(
+              child: MyTextView(
+                marginTop: 14,
+                marginLeft: 15,
+                marginBottom: 14,
+                onClick: viewModel.gotoPropertyNewsPage,
+                S.current.property_news,
+                textColor: context.appColors.textPrimary,
+                fontSize: 16,
+                isFontMedium: true,
+              ),
             ),
-          ),
 
-          //房产新闻列表 (动态)
-          _buildPropertyNews(context, state),
+            //房产新闻列表 (动态)
+            _buildPropertyNews(context, ref),
 
-          //管理员介绍 (固定)
-          _buildManagementGuides(context, ref),
+            //管理员介绍 (固定)
+            _buildManagementGuides(context, ref),
 
-          //间距
-          _buildSliverSpace(15),
-        ],
+            //间距
+            _buildSliverSpace(15),
+          ],
+        ),
       ),
     );
   }
@@ -221,19 +236,74 @@ class HomePage extends HookConsumerWidget {
   }
 
   //Banner的布局
-  Widget _buildBannerImage() {
+  Widget _buildBannerImage(WidgetRef ref, ValueNotifier<int> bannerIndex) {
+    final viewModel = ref.read(homeViewModelProvider.notifier);
+    final state = ref.watch(homeViewModelProvider);
+
     return SliverToBoxAdapter(
       child: Container(
         width: double.infinity,
         margin: const EdgeInsets.only(top: 21, left: 15, right: 15),
-        child: AspectRatio(
-          aspectRatio: 345 / 152.5,
-          child: MyLoadImage(
-            "https://t11.baidu.com/it/u=1326770860,192430039&fm=30&app=106&f=JPEG?w=640&h=427&s=33B5BFAA6A165BCA182937620300D077",
-            width: double.infinity,
-            cornerRadius: 5,
-          ),
-        ),
+        child: state.homeIndex != null && state.homeIndex!.banners.isNotEmpty
+            ? Stack(
+                alignment: Alignment.bottomCenter, // 设置 Stack 的对齐方式为底部中心
+                children: [
+                  CarouselSlider(
+                    options: CarouselOptions(
+                      aspectRatio: 345 / 152.5,
+                      viewportFraction: 1,
+                      initialPage: 0,
+                      enableInfiniteScroll: true,
+                      reverse: false,
+                      autoPlay: true,
+                      autoPlayInterval: const Duration(seconds: 5),
+                      autoPlayAnimationDuration: const Duration(milliseconds: 800),
+                      autoPlayCurve: Curves.fastOutSlowIn,
+                      enlargeCenterPage: true,
+                      scrollDirection: Axis.horizontal,
+                      onPageChanged: (index, reason) {
+                        bannerIndex.value = index;
+                      },
+                    ),
+                    items: state.homeIndex!.banners.map<Widget>((item) {
+                      return MyLoadImage(
+                        item.image,
+                        width: double.infinity,
+                        cornerRadius: 5,
+                      );
+                    }).toList(),
+                  ),
+                  Positioned(
+                    bottom: 10, // 距离底部 20 像素
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: state.homeIndex!.banners.map((item) {
+                        //难道就没有indexMap,要么就转换为Map的方式进行遍历Map
+                        int index = state.homeIndex!.banners.indexOf(item);
+                        return Container(
+                          width: 6.5,
+                          height: 6.5,
+                          margin: const EdgeInsets.symmetric(horizontal: 3.5),
+                          decoration: BoxDecoration(
+                            shape: BoxShape.circle,
+                            color: bannerIndex.value == index
+                                ? const Color(0x4D000000) // 选中状态颜色
+                                : const Color(0x1A000000), // 未选中状态颜色
+                          ),
+                        );
+                      }).toList(),
+                    ),
+                  ),
+                ],
+              )
+            : AspectRatio(
+                aspectRatio: 345 / 152.5,
+                child: MyLoadImage(
+                  Assets.baseLibImageDefaultPlaceholder,
+                  width: double.infinity,
+                  cornerRadius: 5,
+                ),
+              ),
       ),
     );
   }
@@ -297,11 +367,11 @@ class HomePage extends HookConsumerWidget {
                 return Padding(
                   padding: const EdgeInsets.symmetric(vertical: 10),
                   child: LastTransItem(
-                    lastTrans: state.lastTrans[index],
+                    lastTrans: state.homeIndex!.latestTransactions[index],
                   ),
                 );
               },
-              childCount: state.lastTrans.length,
+              childCount: state.homeIndex?.latestTransactions.length ?? 0,
             ),
           ),
         ),
@@ -310,33 +380,40 @@ class HomePage extends HookConsumerWidget {
   }
 
   //房产新闻的双列表
-  Widget _buildPropertyNews(BuildContext context, HomeState state) {
+  Widget _buildPropertyNews(BuildContext context, WidgetRef ref) {
+    final state = ref.watch(homeViewModelProvider);
+    final propertyNewsList = state.homeIndex?.propertyNews ?? [];
+
+    // 计算行数和每行的元素
+    int totalItems = propertyNewsList.length;
+    int firstRowCount = (totalItems + 1) ~/ 2; // 第1行的数量 (奇数时多一个)
+    int secondRowCount = totalItems ~/ 2; // 第2行的数量
+
     return SliverList(
       delegate: SliverChildListDelegate(
         [
-          // PropertyNews(),
-
           // 第一个水平滑动列表
-          _buildPropertyNewsHorizontalList(),
+          _buildPropertyNewsHorizontalList(propertyNewsList.sublist(0, firstRowCount)),
 
           const SizedBox(height: 10),
 
-          // // 第二个水平滑动列表
-          _buildPropertyNewsHorizontalList(),
+          // 第二个水平滑动列表
+          if (secondRowCount > 0) // 只有在有第二行内容时才显示
+            _buildPropertyNewsHorizontalList(propertyNewsList.sublist(firstRowCount, firstRowCount + secondRowCount)),
         ],
       ),
     );
   }
 
-  Widget _buildPropertyNewsHorizontalList() {
+  Widget _buildPropertyNewsHorizontalList(List<HomeListPropertyNews> propertyNews) {
     return SingleChildScrollView(
       scrollDirection: Axis.horizontal,
       physics: const BouncingScrollPhysics(),
       clipBehavior: Clip.none,
       child: Row(
-        children: List.generate(5, (index) {
-          return PropertyNews();
-        }),
+        children: propertyNews.map((news) {
+          return PropertyNews(news: news); // 假设 PropertyNews 需要传入一个 news 参数
+        }).toList(),
       ).marginOnly(left: 15, right: 15),
     );
   }
@@ -365,9 +442,9 @@ class HomePage extends HookConsumerWidget {
           physics: const BouncingScrollPhysics(),
           clipBehavior: Clip.none,
           child: Row(
-            children: List.generate(state.manage_guide.length, (index) {
+            children: List.generate(state.manageGuide.length, (index) {
               return ManageGuideItem(
-                manageGuide: state.manage_guide[index],
+                manageGuide: state.manageGuide[index],
               );
             }),
           ),

+ 102 - 95
packages/cpt_main/lib/modules/home/home_state.dart

@@ -1,103 +1,110 @@
 import 'package:cs_resources/generated/assets.dart';
 import 'package:cs_resources/generated/l10n.dart';
+import 'package:domain/entity/home_list_entity.dart';
 
 class HomeState {
-  final homeCategory = [
-    {
-      'category_name': S.current.facility,
-      'category_icon': Assets.mainHomeFacilityIcon,
-    },
-    {
-      'category_name': S.current.form,
-      'category_icon': Assets.mainHomeFormsIcon,
-    },
-    {
-      'category_name': S.current.notice_board,
-      'category_icon': Assets.mainHomeBoticeBoardIcon,
-    },
-    {
-      'category_name': S.current.property,
-      'category_icon': Assets.mainHomePropertyIcon,
-    },
-    {
-      'category_name': S.current.service,
-      'category_icon': Assets.mainHomeServiceIcon,
-    },
-    {
-      'category_name': S.current.community,
-      'category_icon': Assets.mainHomeCommunityIcon,
-    }
-  ];
+  final List<Map<String, dynamic>> homeCategory;
+  final List<Map<String, dynamic>> lastNews;
+  final List<Map<String, dynamic>> manageGuide;
 
-  final lastNews = [
-    {
-      'category_name': S.current.property,
-      'category_icon': Assets.mainHomePropertyNews,
-      'icon_width': 38.5,
-      'icon_height': 39.5,
-      'margin_right': 13.0,
-    },
-    {
-      'category_name': S.current.internal,
-      'category_icon': Assets.mainHomeInternalNews,
-      'icon_width': 33.5,
-      'icon_height': 41.0,
-      'margin_right': 11.0,
-    },
-    {
-      'category_name': S.current.info,
-      'category_icon': Assets.mainHomeInfoNews,
-      'icon_width': 44.0,
-      'icon_height': 42.0,
-      'margin_right': 6.0,
-    },
-    {
-      'category_name': S.current.notice,
-      'category_icon': Assets.mainHomePublishNews,
-      'icon_width': 40.5,
-      'icon_height': 42.5,
-      'margin_right': 11.0,
-    }
-  ];
+  HomeListEntity? homeIndex;
 
+  HomeState({
+    List<Map<String, dynamic>>? homeCategory,
+    List<Map<String, dynamic>>? lastNews,
+    List<Map<String, dynamic>>? manageGuide,
+    this.homeIndex,
+  })  : homeCategory = homeCategory ??
+            [
+              {
+                'category_name': S.current.facility,
+                'category_icon': Assets.mainHomeFacilityIcon,
+              },
+              {
+                'category_name': S.current.form,
+                'category_icon': Assets.mainHomeFormsIcon,
+              },
+              {
+                'category_name': S.current.notice_board,
+                'category_icon': Assets.mainHomeBoticeBoardIcon,
+              },
+              {
+                'category_name': S.current.property,
+                'category_icon': Assets.mainHomePropertyIcon,
+              },
+              {
+                'category_name': S.current.service,
+                'category_icon': Assets.mainHomeServiceIcon,
+              },
+              {
+                'category_name': S.current.community,
+                'category_icon': Assets.mainHomeCommunityIcon,
+              }
+            ],
+        lastNews = lastNews ??
+            [
+              {
+                'category_name': S.current.property,
+                'category_icon': Assets.mainHomePropertyNews,
+                'icon_width': 38.5,
+                'icon_height': 39.5,
+                'margin_right': 13.0,
+              },
+              {
+                'category_name': S.current.internal,
+                'category_icon': Assets.mainHomeInternalNews,
+                'icon_width': 33.5,
+                'icon_height': 41.0,
+                'margin_right': 11.0,
+              },
+              {
+                'category_name': S.current.info,
+                'category_icon': Assets.mainHomeInfoNews,
+                'icon_width': 44.0,
+                'icon_height': 42.0,
+                'margin_right': 6.0,
+              },
+              {
+                'category_name': S.current.notice,
+                'category_icon': Assets.mainHomePublishNews,
+                'icon_width': 40.5,
+                'icon_height': 42.5,
+                'margin_right': 11.0,
+              }
+            ],
+        manageGuide = manageGuide ??
+            [
+              {
+                'category_name': S.current.introduction_to_info_pack,
+                'category_icon': Assets.mainIntroductionGuide,
+                'icon_width': 118.5,
+                'icon_height': 73.5,
+                'margin_top': 12.0,
+              },
+              {
+                'category_name': S.current.your_roles_responsibilities,
+                'category_icon': Assets.mainRolesGuide,
+                'icon_width': 116,
+                'icon_height': 78,
+                'margin_top': 8.5,
+              },
+              {
+                'category_name': S.current.property_guide,
+                'category_icon': Assets.mainPropertyGuide,
+                'icon_width': 117.0,
+                'icon_height': 76.5,
+                'margin_top': 10.0,
+              },
+            ];
 
-  final manage_guide = [
-    {
-      'category_name': S.current.introduction_to_info_pack,
-      'category_icon': Assets.mainIntroductionGuide,
-      'icon_width': 118.5,
-      'icon_height': 73.5,
-      'margin_top': 12.0,
-    },
-    {
-      'category_name': S.current.your_roles_responsibilities,
-      'category_icon': Assets.mainRolesGuide,
-      'icon_width': 116,
-      'icon_height': 78,
-      'margin_top': 8.5,
-    },
-    {
-      'category_name': S.current.property_guide,
-      'category_icon': Assets.mainPropertyGuide,
-      'icon_width': 117.0,
-      'icon_height': 76.5,
-      'margin_top': 10.0,
-    },
-  ];
-
-  //模拟数据
-  final lastTrans = [
-    {
-      'title': '18 Sep 2024 Blk 39 #09-XX',
-      'price': '1,001 - 1,337 sqft',
-      'total': '1.338 M',
-      'unit': '',
-    },
-    {
-      'title': 'Jul 2024  Blk XX #XX to XX',
-      'price': '1,100 - 1,200 sqft',
-      'total': '4,000 M',
-      'unit': 'per month',
-    },
-  ];
+  HomeState copyWith({
+    HomeListEntity? homeIndex,
+  }) {
+    return HomeState(
+      homeIndex: homeIndex ?? this.homeIndex,
+      homeCategory: homeCategory,
+      lastNews: lastNews,
+      manageGuide: manageGuide,
+    );
+  }
 }

+ 43 - 3
packages/cpt_main/lib/modules/home/home_view_model.dart

@@ -1,9 +1,11 @@
 import 'package:cpt_main/modules/home/property_news/home_property_news_page.dart';
 import 'package:cpt_main/modules/notification/notification_page.dart';
+import 'package:domain/repository/main_repository.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
+import 'package:plugin_platform/http/dio/dio_cancelable_mixin.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:router/componentRouter/community_service.dart';
 import 'package:router/componentRouter/component_service_manager.dart';
+import 'package:widgets/widget_export.dart';
 
 import 'home_state.dart';
 import 'latest_news/latest_news_page.dart';
@@ -12,10 +14,47 @@ import 'management_guides/management_guides_page.dart';
 part 'home_view_model.g.dart';
 
 @riverpod
-class HomeViewModel extends _$HomeViewModel {
+class HomeViewModel extends _$HomeViewModel with DioCancelableMixin {
+  late final MainRepository _mainRepository;
+  var _needShowLoading = true; //是否展示LoadingView
+
+  // Refresh 控制器
+  final EasyRefreshController refreshController = EasyRefreshController(
+    controlFinishRefresh: true, //允许刷新
+    controlFinishLoad: false, //允许加载
+  );
+
   @override
   HomeState build() {
-    return HomeState();
+    _mainRepository = ref.read(mainRepositoryProvider);
+    final state = HomeState();
+    registerCancellation();
+    return state;
+  }
+
+  // Refresh 刷新事件
+  Future onRefresh() async {
+    fetchHomeIndex();
+  }
+
+  /// 获取首页数据
+  Future fetchHomeIndex() async {
+    // 获取列表
+    var result = await _mainRepository.fetchHomeIndex(
+      needLoading: _needShowLoading,
+      cancelToken: cancelToken,
+    );
+
+    // 处理数据
+    if (result.isSuccess) {
+      state = state.copyWith(homeIndex: result.data);
+    } else {
+      ToastEngine.show(result.errorMsg ?? "Network Load Error");
+    }
+
+    // 最后赋值
+    _needShowLoading = false;
+    refreshController.finishRefresh();
   }
 
   /// 根据索引触发点击的事件
@@ -72,4 +111,5 @@ class HomeViewModel extends _$HomeViewModel {
   void gotoManageGuidePage() {
     ManagementGuidesPage.startInstance();
   }
+
 }

+ 16 - 15
packages/cpt_main/lib/modules/home/item_home_last_trans.dart

@@ -1,5 +1,6 @@
 import 'package:cpt_main/modules/feedback/feedback_page.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:domain/entity/home_list_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:shared/utils/util.dart';
 import 'package:widgets/ext/ex_widget.dart';
@@ -7,7 +8,7 @@ import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 
 class LastTransItem extends StatelessWidget {
-  final Map<String, dynamic> lastTrans;
+  HomeListLatestTransactions lastTrans;
 
   LastTransItem({required this.lastTrans});
 
@@ -22,13 +23,13 @@ class LastTransItem extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             MyTextView(
-              lastTrans['title'],
+              lastTrans.title ?? "",
               fontSize: 15,
               textColor: context.appColors.textBlack,
               isFontMedium: true,
             ),
             MyTextView(
-              lastTrans['price'],
+              lastTrans.price ?? "",
               fontSize: 15,
               marginTop: 5,
               textColor: context.appColors.textBlack,
@@ -36,10 +37,9 @@ class LastTransItem extends StatelessWidget {
             ),
           ],
         ).expanded(),
-
         Container(
-          width: 91.5,
           margin: const EdgeInsets.only(left: 10),
+          padding: const EdgeInsets.symmetric(horizontal: 5),
           height: 45,
           decoration: BoxDecoration(
             color: context.appColors.lightPurpleBg,
@@ -50,22 +50,23 @@ class LastTransItem extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               MyTextView(
-               "\$${lastTrans['total']}",
+                "\$${lastTrans.price ?? "-"}",
                 fontSize: 17,
                 textColor: context.appColors.textBlack,
                 isFontMedium: true,
               ),
-              Visibility(
-                  visible: Utils.isNotEmpty(lastTrans['unit']),
-                  child: MyTextView(
-                    lastTrans['unit'],
-                    fontSize: 12,
-                    textColor: context.appColors.textBlack,
-                    isFontRegular: true,
-                  ))
+              //单元,每个月或者没有单元
+              // Visibility(
+              //     visible: Utils.isNotEmpty(lastTrans['unit']),
+              //     child: MyTextView(
+              //       lastTrans['unit'],
+              //       fontSize: 12,
+              //       textColor: context.appColors.textBlack,
+              //       isFontRegular: true,
+              //     ))
             ],
           ),
-        ),
+        ).constrained(minWidth: 92),
       ],
     );
   }

+ 6 - 3
packages/cpt_main/lib/modules/home/item_home_property_news.dart

@@ -1,5 +1,6 @@
 import 'package:cpt_main/modules/feedback/feedback_page.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:domain/entity/home_list_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:shared/utils/util.dart';
 import 'package:widgets/ext/ex_widget.dart';
@@ -7,7 +8,9 @@ import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 
 class PropertyNews extends StatelessWidget {
-  PropertyNews();
+  final HomeListPropertyNews? news;
+
+  PropertyNews({required this.news});
 
   @override
   Widget build(BuildContext context) {
@@ -16,12 +19,12 @@ class PropertyNews extends StatelessWidget {
       mainAxisAlignment: MainAxisAlignment.start,
       children: [
         MyLoadImage(
-          "https://t11.baidu.com/it/u=4142771387,220552469&fm=30&app=106&f=JPEG?w=564&h=604&s=FA2FB04406270B0D68AE05910300509B",
+          news?.coverImage,
           width: 80,
           height: 80,
         ),
         MyTextView(
-          "Key Appeals and Performance of Nonlan-ded Properties in District 19",
+          news?.title ?? "",
           fontSize: 15,
           marginLeft: 12.5,
           marginRight: 12.5,

+ 9 - 1
packages/cs_domain/lib/constants/api_constants.dart

@@ -53,6 +53,15 @@ class ApiConstants {
   //访客状态列表
   static const apiVisitorList = "/api/v1/user/visitor/index";
 
+  //首页的列表接口
+  static const apiHomeList = "/api/v1/user/home/index";
+
+  //首页-最新新闻列表
+  static const apiLatestNewsList = "/api/v1/user/latest/news/list";
+
+  //首页-最新新闻列表
+  static const apiLatestNewsDetail = "/api/v1/user/latest/news/detail";
+
   // =========================== Profile ↓=========================================
 
   //用户Me页面详情
@@ -133,7 +142,6 @@ class ApiConstants {
   //可支付列表
   static const apiPaymentList = "/api/v1/user/payment/bill/index";
 
-
   // =========================== 其他 ↓=========================================
 
   //服务器时间

+ 13 - 11
packages/cs_domain/lib/entity/facility_index_entity.dart

@@ -5,18 +5,20 @@ export 'package:domain/generated/json/facility_index_entity.g.dart';
 
 @JsonSerializable()
 class FacilityIndexEntity {
-	String? id;
-	String? icon;
-	String? name;
+  String? id;
+  String? icon;
+  String? name;
+  @JSONField(name: "map_resources")
+  List<String> mapResources = [];
 
-	FacilityIndexEntity();
+  FacilityIndexEntity();
 
-	factory FacilityIndexEntity.fromJson(Map<String, dynamic> json) => $FacilityIndexEntityFromJson(json);
+  factory FacilityIndexEntity.fromJson(Map<String, dynamic> json) => $FacilityIndexEntityFromJson(json);
 
-	Map<String, dynamic> toJson() => $FacilityIndexEntityToJson(this);
+  Map<String, dynamic> toJson() => $FacilityIndexEntityToJson(this);
 
-	@override
-	String toString() {
-		return jsonEncode(this);
-	}
-}
+  @override
+  String toString() {
+    return jsonEncode(this);
+  }
+}

+ 84 - 0
packages/cs_domain/lib/entity/home_list_entity.dart

@@ -0,0 +1,84 @@
+import 'package:domain/generated/json/base/json_field.dart';
+import 'package:domain/generated/json/home_list_entity.g.dart';
+import 'dart:convert';
+export 'package:domain/generated/json/home_list_entity.g.dart';
+
+@JsonSerializable()
+class HomeListEntity {
+	List<HomeListBanners> banners = [];
+	@JSONField(name: "latest_transactions")
+	List<HomeListLatestTransactions> latestTransactions = [];
+	@JSONField(name: "property_news")
+	List<HomeListPropertyNews> propertyNews = [];
+
+	HomeListEntity();
+
+	factory HomeListEntity.fromJson(Map<String, dynamic> json) => $HomeListEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $HomeListEntityToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+@JsonSerializable()
+class HomeListBanners {
+	String? id;
+	String? name;
+	String? image;
+
+	HomeListBanners();
+
+	factory HomeListBanners.fromJson(Map<String, dynamic> json) => $HomeListBannersFromJson(json);
+
+	Map<String, dynamic> toJson() => $HomeListBannersToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+@JsonSerializable()
+class HomeListLatestTransactions {
+	String? id;
+	int type = 0;
+	String? title;
+	String? price;
+	@JSONField(name: "created_at")
+	String? createdAt;
+
+	HomeListLatestTransactions();
+
+	factory HomeListLatestTransactions.fromJson(Map<String, dynamic> json) => $HomeListLatestTransactionsFromJson(json);
+
+	Map<String, dynamic> toJson() => $HomeListLatestTransactionsToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+@JsonSerializable()
+class HomeListPropertyNews {
+	String? id;
+	String? title;
+	@JSONField(name: "cover_image")
+	String? coverImage;
+	@JSONField(name: "created_at")
+	String? createdAt;
+
+	HomeListPropertyNews();
+
+	factory HomeListPropertyNews.fromJson(Map<String, dynamic> json) => $HomeListPropertyNewsFromJson(json);
+
+	Map<String, dynamic> toJson() => $HomeListPropertyNewsToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}

+ 27 - 0
packages/cs_domain/lib/entity/latest_news_detail_entity.dart

@@ -0,0 +1,27 @@
+import 'package:domain/generated/json/base/json_field.dart';
+import 'package:domain/generated/json/latest_news_detail_entity.g.dart';
+import 'dart:convert';
+export 'package:domain/generated/json/latest_news_detail_entity.g.dart';
+
+@JsonSerializable()
+class LatestNewsDetailEntity {
+	String? id;
+	int type = 0;
+	String? title;
+	@JSONField(name: "cover_image")
+	String? coverImage;
+	String? content;
+	@JSONField(name: "created_at")
+	String? createdAt;
+
+	LatestNewsDetailEntity();
+
+	factory LatestNewsDetailEntity.fromJson(Map<String, dynamic> json) => $LatestNewsDetailEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $LatestNewsDetailEntityToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}

+ 48 - 0
packages/cs_domain/lib/entity/latest_news_page_entity.dart

@@ -0,0 +1,48 @@
+import 'package:domain/generated/json/base/json_field.dart';
+import 'package:domain/generated/json/latest_news_page_entity.g.dart';
+import 'dart:convert';
+export 'package:domain/generated/json/latest_news_page_entity.g.dart';
+
+@JsonSerializable()
+class LatestNewsPageEntity {
+  int count = 0;
+  int page = 0;
+  int limit = 0;
+  @JSONField(name: "count_page")
+  int countPage = 0;
+  List<LatestNewsList>? list = [];
+
+  LatestNewsPageEntity();
+
+  factory LatestNewsPageEntity.fromJson(Map<String, dynamic> json) => $LatestNewsPageEntityFromJson(json);
+
+  Map<String, dynamic> toJson() => $LatestNewsPageEntityToJson(this);
+
+  @override
+  String toString() {
+    return jsonEncode(this);
+  }
+}
+
+@JsonSerializable()
+class LatestNewsList {
+  String? id;
+  int type = 0;
+  String? title;
+  @JSONField(name: "cover_image")
+  String? coverImage;
+  String? content;
+  @JSONField(name: "created_at")
+  String? createdAt;
+
+  LatestNewsList();
+
+  factory LatestNewsList.fromJson(Map<String, dynamic> json) => $LatestNewsListFromJson(json);
+
+  Map<String, dynamic> toJson() => $LatestNewsListToJson(this);
+
+  @override
+  String toString() {
+    return jsonEncode(this);
+  }
+}

+ 137 - 213
packages/cs_domain/lib/generated/json/base/json_convert_content.dart

@@ -19,7 +19,10 @@ import 'package:domain/entity/form_submitted_entity.dart';
 import 'package:domain/entity/form_submitted_page_entity.dart';
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
 import 'package:domain/entity/garage_sale_rent_entity.dart';
+import 'package:domain/entity/home_list_entity.dart';
 import 'package:domain/entity/id_name_entity.dart';
+import 'package:domain/entity/latest_news_detail_entity.dart';
+import 'package:domain/entity/latest_news_page_entity.dart';
 import 'package:domain/entity/myfollowing_list_entity.dart';
 import 'package:domain/entity/myposts_newsfeed_entity.dart';
 import 'package:domain/entity/myposts_sale_rent_entity.dart';
@@ -104,14 +107,12 @@ class JsonConvert {
     }
   }
 
-  List<T?>? convertList<T>(List<dynamic>? value,
-      {EnumConvertFunction? enumConvert}) {
+  List<T?>? convertList<T>(List<dynamic>? value, {EnumConvertFunction? enumConvert}) {
     if (value == null) {
       return null;
     }
     try {
-      return value.map((dynamic e) => _asT<T>(e, enumConvert: enumConvert))
-          .toList();
+      return value.map((dynamic e) => _asT<T>(e, enumConvert: enumConvert)).toList();
     } catch (e, stackTrace) {
       debugPrint('asT<$T> $e $stackTrace');
       if (onError != null) {
@@ -121,14 +122,12 @@ class JsonConvert {
     }
   }
 
-  List<T>? convertListNotNull<T>(dynamic value,
-      {EnumConvertFunction? enumConvert}) {
+  List<T>? convertListNotNull<T>(dynamic value, {EnumConvertFunction? enumConvert}) {
     if (value == null) {
       return null;
     }
     try {
-      return (value as List<dynamic>).map((dynamic e) =>
-      _asT<T>(e, enumConvert: enumConvert)!).toList();
+      return (value as List<dynamic>).map((dynamic e) => _asT<T>(e, enumConvert: enumConvert)!).toList();
     } catch (e, stackTrace) {
       debugPrint('asT<$T> $e $stackTrace');
       if (onError != null) {
@@ -176,8 +175,7 @@ class JsonConvert {
           return covertFunc(Map<String, dynamic>.from(value)) as T;
         }
       } else {
-        throw UnimplementedError(
-            '$type unimplemented,you can try running the app again');
+        throw UnimplementedError('$type unimplemented,you can try running the app again');
       }
     }
   }
@@ -185,353 +183,286 @@ class JsonConvert {
   //list is returned by type
   static M? _getListChildType<M>(List<Map<String, dynamic>> data) {
     if (<AuthLoginEntity>[] is M) {
-      return data.map<AuthLoginEntity>((Map<String, dynamic> e) =>
-          AuthLoginEntity.fromJson(e)).toList() as M;
+      return data.map<AuthLoginEntity>((Map<String, dynamic> e) => AuthLoginEntity.fromJson(e)).toList() as M;
     }
     if (<CaptchaImgEntity>[] is M) {
-      return data.map<CaptchaImgEntity>((Map<String, dynamic> e) =>
-          CaptchaImgEntity.fromJson(e)).toList() as M;
+      return data.map<CaptchaImgEntity>((Map<String, dynamic> e) => CaptchaImgEntity.fromJson(e)).toList() as M;
     }
     if (<FacilityBookEntity>[] is M) {
-      return data.map<FacilityBookEntity>((Map<String, dynamic> e) =>
-          FacilityBookEntity.fromJson(e)).toList() as M;
+      return data.map<FacilityBookEntity>((Map<String, dynamic> e) => FacilityBookEntity.fromJson(e)).toList() as M;
     }
     if (<FacilityBookFacilityType>[] is M) {
-      return data.map<FacilityBookFacilityType>((Map<String, dynamic> e) =>
-          FacilityBookFacilityType.fromJson(e)).toList() as M;
+      return data.map<FacilityBookFacilityType>((Map<String, dynamic> e) => FacilityBookFacilityType.fromJson(e)).toList() as M;
     }
     if (<FacilityBookFacilities>[] is M) {
-      return data.map<FacilityBookFacilities>((Map<String, dynamic> e) =>
-          FacilityBookFacilities.fromJson(e)).toList() as M;
+      return data.map<FacilityBookFacilities>((Map<String, dynamic> e) => FacilityBookFacilities.fromJson(e)).toList() as M;
     }
     if (<FacilityBookFacilitiesPeriods>[] is M) {
-      return data.map<FacilityBookFacilitiesPeriods>((Map<String, dynamic> e) =>
-          FacilityBookFacilitiesPeriods.fromJson(e)).toList() as M;
+      return data.map<FacilityBookFacilitiesPeriods>((Map<String, dynamic> e) => FacilityBookFacilitiesPeriods.fromJson(e)).toList() as M;
     }
     if (<FacilityIndexEntity>[] is M) {
-      return data.map<FacilityIndexEntity>((Map<String, dynamic> e) =>
-          FacilityIndexEntity.fromJson(e)).toList() as M;
+      return data.map<FacilityIndexEntity>((Map<String, dynamic> e) => FacilityIndexEntity.fromJson(e)).toList() as M;
     }
     if (<FacilityPageEntity>[] is M) {
-      return data.map<FacilityPageEntity>((Map<String, dynamic> e) =>
-          FacilityPageEntity.fromJson(e)).toList() as M;
+      return data.map<FacilityPageEntity>((Map<String, dynamic> e) => FacilityPageEntity.fromJson(e)).toList() as M;
     }
     if (<FacilityDetail>[] is M) {
-      return data.map<FacilityDetail>((Map<String, dynamic> e) =>
-          FacilityDetail.fromJson(e)).toList() as M;
+      return data.map<FacilityDetail>((Map<String, dynamic> e) => FacilityDetail.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListBooking>[] is M) {
-      return data.map<FacilityPageListBooking>((Map<String, dynamic> e) =>
-          FacilityPageListBooking.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListBooking>((Map<String, dynamic> e) => FacilityPageListBooking.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListFacility>[] is M) {
-      return data.map<FacilityPageListFacility>((Map<String, dynamic> e) =>
-          FacilityPageListFacility.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListFacility>((Map<String, dynamic> e) => FacilityPageListFacility.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListFacilityType>[] is M) {
-      return data.map<FacilityPageListFacilityType>((Map<String, dynamic> e) =>
-          FacilityPageListFacilityType.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListFacilityType>((Map<String, dynamic> e) => FacilityPageListFacilityType.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListTimePeriod>[] is M) {
-      return data.map<FacilityPageListTimePeriod>((Map<String, dynamic> e) =>
-          FacilityPageListTimePeriod.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListTimePeriod>((Map<String, dynamic> e) => FacilityPageListTimePeriod.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListAccount>[] is M) {
-      return data.map<FacilityPageListAccount>((Map<String, dynamic> e) =>
-          FacilityPageListAccount.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListAccount>((Map<String, dynamic> e) => FacilityPageListAccount.fromJson(e)).toList() as M;
     }
     if (<FeedbackDetailEntity>[] is M) {
-      return data.map<FeedbackDetailEntity>((Map<String, dynamic> e) =>
-          FeedbackDetailEntity.fromJson(e)).toList() as M;
+      return data.map<FeedbackDetailEntity>((Map<String, dynamic> e) => FeedbackDetailEntity.fromJson(e)).toList() as M;
     }
     if (<FeedbackDetailReplies>[] is M) {
-      return data.map<FeedbackDetailReplies>((Map<String, dynamic> e) =>
-          FeedbackDetailReplies.fromJson(e)).toList() as M;
+      return data.map<FeedbackDetailReplies>((Map<String, dynamic> e) => FeedbackDetailReplies.fromJson(e)).toList() as M;
     }
     if (<FeedbackListEntity>[] is M) {
-      return data.map<FeedbackListEntity>((Map<String, dynamic> e) =>
-          FeedbackListEntity.fromJson(e)).toList() as M;
+      return data.map<FeedbackListEntity>((Map<String, dynamic> e) => FeedbackListEntity.fromJson(e)).toList() as M;
     }
     if (<FeedbackItemEntity>[] is M) {
-      return data.map<FeedbackItemEntity>((Map<String, dynamic> e) =>
-          FeedbackItemEntity.fromJson(e)).toList() as M;
+      return data.map<FeedbackItemEntity>((Map<String, dynamic> e) => FeedbackItemEntity.fromJson(e)).toList() as M;
     }
     if (<FormContentEntity>[] is M) {
-      return data.map<FormContentEntity>((Map<String, dynamic> e) =>
-          FormContentEntity.fromJson(e)).toList() as M;
+      return data.map<FormContentEntity>((Map<String, dynamic> e) => FormContentEntity.fromJson(e)).toList() as M;
     }
     if (<FormDetailEntity>[] is M) {
-      return data.map<FormDetailEntity>((Map<String, dynamic> e) =>
-          FormDetailEntity.fromJson(e)).toList() as M;
+      return data.map<FormDetailEntity>((Map<String, dynamic> e) => FormDetailEntity.fromJson(e)).toList() as M;
     }
     if (<FormListEntity>[] is M) {
-      return data.map<FormListEntity>((Map<String, dynamic> e) =>
-          FormListEntity.fromJson(e)).toList() as M;
+      return data.map<FormListEntity>((Map<String, dynamic> e) => FormListEntity.fromJson(e)).toList() as M;
     }
     if (<FormOptionEntity>[] is M) {
-      return data.map<FormOptionEntity>((Map<String, dynamic> e) =>
-          FormOptionEntity.fromJson(e)).toList() as M;
+      return data.map<FormOptionEntity>((Map<String, dynamic> e) => FormOptionEntity.fromJson(e)).toList() as M;
     }
     if (<FormSubmittedEntity>[] is M) {
-      return data.map<FormSubmittedEntity>((Map<String, dynamic> e) =>
-          FormSubmittedEntity.fromJson(e)).toList() as M;
+      return data.map<FormSubmittedEntity>((Map<String, dynamic> e) => FormSubmittedEntity.fromJson(e)).toList() as M;
     }
     if (<FormSubmittedEstateOnlineForm>[] is M) {
-      return data.map<FormSubmittedEstateOnlineForm>((Map<String, dynamic> e) =>
-          FormSubmittedEstateOnlineForm.fromJson(e)).toList() as M;
+      return data.map<FormSubmittedEstateOnlineForm>((Map<String, dynamic> e) => FormSubmittedEstateOnlineForm.fromJson(e)).toList() as M;
     }
     if (<FormSubmittedPageEntity>[] is M) {
-      return data.map<FormSubmittedPageEntity>((Map<String, dynamic> e) =>
-          FormSubmittedPageEntity.fromJson(e)).toList() as M;
+      return data.map<FormSubmittedPageEntity>((Map<String, dynamic> e) => FormSubmittedPageEntity.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentDetailEntity>[] is M) {
-      return data.map<GarageSaleRentDetailEntity>((Map<String, dynamic> e) =>
-          GarageSaleRentDetailEntity.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentDetailEntity>((Map<String, dynamic> e) => GarageSaleRentDetailEntity.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentDetailAccount>[] is M) {
-      return data.map<GarageSaleRentDetailAccount>((Map<String, dynamic> e) =>
-          GarageSaleRentDetailAccount.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentDetailAccount>((Map<String, dynamic> e) => GarageSaleRentDetailAccount.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentEntity>[] is M) {
-      return data.map<GarageSaleRentEntity>((Map<String, dynamic> e) =>
-          GarageSaleRentEntity.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentEntity>((Map<String, dynamic> e) => GarageSaleRentEntity.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentList>[] is M) {
-      return data.map<GarageSaleRentList>((Map<String, dynamic> e) =>
-          GarageSaleRentList.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentList>((Map<String, dynamic> e) => GarageSaleRentList.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentListAccount>[] is M) {
-      return data.map<GarageSaleRentListAccount>((Map<String, dynamic> e) =>
-          GarageSaleRentListAccount.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentListAccount>((Map<String, dynamic> e) => GarageSaleRentListAccount.fromJson(e)).toList() as M;
+    }
+    if (<HomeListEntity>[] is M) {
+      return data.map<HomeListEntity>((Map<String, dynamic> e) => HomeListEntity.fromJson(e)).toList() as M;
+    }
+    if (<HomeListBanners>[] is M) {
+      return data.map<HomeListBanners>((Map<String, dynamic> e) => HomeListBanners.fromJson(e)).toList() as M;
+    }
+    if (<HomeListLatestTransactions>[] is M) {
+      return data.map<HomeListLatestTransactions>((Map<String, dynamic> e) => HomeListLatestTransactions.fromJson(e)).toList() as M;
+    }
+    if (<HomeListPropertyNews>[] is M) {
+      return data.map<HomeListPropertyNews>((Map<String, dynamic> e) => HomeListPropertyNews.fromJson(e)).toList() as M;
     }
     if (<IdNameEntity>[] is M) {
-      return data.map<IdNameEntity>((Map<String, dynamic> e) =>
-          IdNameEntity.fromJson(e)).toList() as M;
+      return data.map<IdNameEntity>((Map<String, dynamic> e) => IdNameEntity.fromJson(e)).toList() as M;
+    }
+    if (<LatestNewsDetailEntity>[] is M) {
+      return data.map<LatestNewsDetailEntity>((Map<String, dynamic> e) => LatestNewsDetailEntity.fromJson(e)).toList() as M;
+    }
+    if (<LatestNewsPageEntity>[] is M) {
+      return data.map<LatestNewsPageEntity>((Map<String, dynamic> e) => LatestNewsPageEntity.fromJson(e)).toList() as M;
+    }
+    if (<LatestNewsList>[] is M) {
+      return data.map<LatestNewsList>((Map<String, dynamic> e) => LatestNewsList.fromJson(e)).toList() as M;
     }
     if (<MyfollowingListEntity>[] is M) {
-      return data.map<MyfollowingListEntity>((Map<String, dynamic> e) =>
-          MyfollowingListEntity.fromJson(e)).toList() as M;
+      return data.map<MyfollowingListEntity>((Map<String, dynamic> e) => MyfollowingListEntity.fromJson(e)).toList() as M;
     }
     if (<MypostsNewsfeedEntity>[] is M) {
-      return data.map<MypostsNewsfeedEntity>((Map<String, dynamic> e) =>
-          MypostsNewsfeedEntity.fromJson(e)).toList() as M;
+      return data.map<MypostsNewsfeedEntity>((Map<String, dynamic> e) => MypostsNewsfeedEntity.fromJson(e)).toList() as M;
     }
     if (<MypostsNewsfeedList>[] is M) {
-      return data.map<MypostsNewsfeedList>((Map<String, dynamic> e) =>
-          MypostsNewsfeedList.fromJson(e)).toList() as M;
+      return data.map<MypostsNewsfeedList>((Map<String, dynamic> e) => MypostsNewsfeedList.fromJson(e)).toList() as M;
     }
     if (<MypostsNewsfeedListAccount>[] is M) {
-      return data.map<MypostsNewsfeedListAccount>((Map<String, dynamic> e) =>
-          MypostsNewsfeedListAccount.fromJson(e)).toList() as M;
+      return data.map<MypostsNewsfeedListAccount>((Map<String, dynamic> e) => MypostsNewsfeedListAccount.fromJson(e)).toList() as M;
     }
     if (<MypostsSaleRentEntity>[] is M) {
-      return data.map<MypostsSaleRentEntity>((Map<String, dynamic> e) =>
-          MypostsSaleRentEntity.fromJson(e)).toList() as M;
+      return data.map<MypostsSaleRentEntity>((Map<String, dynamic> e) => MypostsSaleRentEntity.fromJson(e)).toList() as M;
     }
     if (<MypostsSaleRentList>[] is M) {
-      return data.map<MypostsSaleRentList>((Map<String, dynamic> e) =>
-          MypostsSaleRentList.fromJson(e)).toList() as M;
+      return data.map<MypostsSaleRentList>((Map<String, dynamic> e) => MypostsSaleRentList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedCommentPublishEntity>[] is M) {
-      return data.map<NewsfeedCommentPublishEntity>((Map<String, dynamic> e) =>
-          NewsfeedCommentPublishEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedCommentPublishEntity>((Map<String, dynamic> e) => NewsfeedCommentPublishEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailEntity>[] is M) {
-      return data.map<NewsfeedDetailEntity>((Map<String, dynamic> e) =>
-          NewsfeedDetailEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailEntity>((Map<String, dynamic> e) => NewsfeedDetailEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailAccount>[] is M) {
-      return data.map<NewsfeedDetailAccount>((Map<String, dynamic> e) =>
-          NewsfeedDetailAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailAccount>((Map<String, dynamic> e) => NewsfeedDetailAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailComments>[] is M) {
-      return data.map<NewsfeedDetailComments>((Map<String, dynamic> e) =>
-          NewsfeedDetailComments.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailComments>((Map<String, dynamic> e) => NewsfeedDetailComments.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailCommentsAccount>[] is M) {
-      return data.map<NewsfeedDetailCommentsAccount>((Map<String, dynamic> e) =>
-          NewsfeedDetailCommentsAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailCommentsAccount>((Map<String, dynamic> e) => NewsfeedDetailCommentsAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailCommentsToAccount>[] is M) {
-      return data.map<NewsfeedDetailCommentsToAccount>((
-          Map<String, dynamic> e) =>
-          NewsfeedDetailCommentsToAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailCommentsToAccount>((Map<String, dynamic> e) => NewsfeedDetailCommentsToAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedFollowingEntity>[] is M) {
-      return data.map<NewsfeedFollowingEntity>((Map<String, dynamic> e) =>
-          NewsfeedFollowingEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedFollowingEntity>((Map<String, dynamic> e) => NewsfeedFollowingEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedFollowingList>[] is M) {
-      return data.map<NewsfeedFollowingList>((Map<String, dynamic> e) =>
-          NewsfeedFollowingList.fromJson(e)).toList() as M;
+      return data.map<NewsfeedFollowingList>((Map<String, dynamic> e) => NewsfeedFollowingList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedFollowingListAccount>[] is M) {
-      return data.map<NewsfeedFollowingListAccount>((Map<String, dynamic> e) =>
-          NewsfeedFollowingListAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedFollowingListAccount>((Map<String, dynamic> e) => NewsfeedFollowingListAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedForyouEntity>[] is M) {
-      return data.map<NewsfeedForyouEntity>((Map<String, dynamic> e) =>
-          NewsfeedForyouEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedForyouEntity>((Map<String, dynamic> e) => NewsfeedForyouEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedForyouList>[] is M) {
-      return data.map<NewsfeedForyouList>((Map<String, dynamic> e) =>
-          NewsfeedForyouList.fromJson(e)).toList() as M;
+      return data.map<NewsfeedForyouList>((Map<String, dynamic> e) => NewsfeedForyouList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedForyouListAccount>[] is M) {
-      return data.map<NewsfeedForyouListAccount>((Map<String, dynamic> e) =>
-          NewsfeedForyouListAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedForyouListAccount>((Map<String, dynamic> e) => NewsfeedForyouListAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedNewsEntity>[] is M) {
-      return data.map<NewsfeedNewsEntity>((Map<String, dynamic> e) =>
-          NewsfeedNewsEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedNewsEntity>((Map<String, dynamic> e) => NewsfeedNewsEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedNewsList>[] is M) {
-      return data.map<NewsfeedNewsList>((Map<String, dynamic> e) =>
-          NewsfeedNewsList.fromJson(e)).toList() as M;
+      return data.map<NewsfeedNewsList>((Map<String, dynamic> e) => NewsfeedNewsList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedNewsListAccount>[] is M) {
-      return data.map<NewsfeedNewsListAccount>((Map<String, dynamic> e) =>
-          NewsfeedNewsListAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedNewsListAccount>((Map<String, dynamic> e) => NewsfeedNewsListAccount.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardAnnounEntity>[] is M) {
-      return data.map<NoticeBoardAnnounEntity>((Map<String, dynamic> e) =>
-          NoticeBoardAnnounEntity.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardAnnounEntity>((Map<String, dynamic> e) => NoticeBoardAnnounEntity.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardDocumentsEntity>[] is M) {
-      return data.map<NoticeBoardDocumentsEntity>((Map<String, dynamic> e) =>
-          NoticeBoardDocumentsEntity.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardDocumentsEntity>((Map<String, dynamic> e) => NoticeBoardDocumentsEntity.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardEventEntity>[] is M) {
-      return data.map<NoticeBoardEventEntity>((Map<String, dynamic> e) =>
-          NoticeBoardEventEntity.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardEventEntity>((Map<String, dynamic> e) => NoticeBoardEventEntity.fromJson(e)).toList() as M;
     }
     if (<PaymentPageEntity>[] is M) {
-      return data.map<PaymentPageEntity>((Map<String, dynamic> e) =>
-          PaymentPageEntity.fromJson(e)).toList() as M;
+      return data.map<PaymentPageEntity>((Map<String, dynamic> e) => PaymentPageEntity.fromJson(e)).toList() as M;
     }
     if (<PaymentPageList>[] is M) {
-      return data.map<PaymentPageList>((Map<String, dynamic> e) =>
-          PaymentPageList.fromJson(e)).toList() as M;
+      return data.map<PaymentPageList>((Map<String, dynamic> e) => PaymentPageList.fromJson(e)).toList() as M;
     }
     if (<PropertyNewsDetailEntity>[] is M) {
-      return data.map<PropertyNewsDetailEntity>((Map<String, dynamic> e) =>
-          PropertyNewsDetailEntity.fromJson(e)).toList() as M;
+      return data.map<PropertyNewsDetailEntity>((Map<String, dynamic> e) => PropertyNewsDetailEntity.fromJson(e)).toList() as M;
     }
     if (<PropertyNewsEntity>[] is M) {
-      return data.map<PropertyNewsEntity>((Map<String, dynamic> e) =>
-          PropertyNewsEntity.fromJson(e)).toList() as M;
+      return data.map<PropertyNewsEntity>((Map<String, dynamic> e) => PropertyNewsEntity.fromJson(e)).toList() as M;
     }
     if (<PropertyNewsList>[] is M) {
-      return data.map<PropertyNewsList>((Map<String, dynamic> e) =>
-          PropertyNewsList.fromJson(e)).toList() as M;
+      return data.map<PropertyNewsList>((Map<String, dynamic> e) => PropertyNewsList.fromJson(e)).toList() as M;
     }
     if (<PropertySaleRentEntity>[] is M) {
-      return data.map<PropertySaleRentEntity>((Map<String, dynamic> e) =>
-          PropertySaleRentEntity.fromJson(e)).toList() as M;
+      return data.map<PropertySaleRentEntity>((Map<String, dynamic> e) => PropertySaleRentEntity.fromJson(e)).toList() as M;
     }
     if (<PropertySaleRentList>[] is M) {
-      return data.map<PropertySaleRentList>((Map<String, dynamic> e) =>
-          PropertySaleRentList.fromJson(e)).toList() as M;
+      return data.map<PropertySaleRentList>((Map<String, dynamic> e) => PropertySaleRentList.fromJson(e)).toList() as M;
     }
     if (<RewardsCategoryEntity>[] is M) {
-      return data.map<RewardsCategoryEntity>((Map<String, dynamic> e) =>
-          RewardsCategoryEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsCategoryEntity>((Map<String, dynamic> e) => RewardsCategoryEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsHistoryEarnedEntity>[] is M) {
-      return data.map<RewardsHistoryEarnedEntity>((Map<String, dynamic> e) =>
-          RewardsHistoryEarnedEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHistoryEarnedEntity>((Map<String, dynamic> e) => RewardsHistoryEarnedEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeEntity>[] is M) {
-      return data.map<RewardsHomeEntity>((Map<String, dynamic> e) =>
-          RewardsHomeEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeEntity>((Map<String, dynamic> e) => RewardsHomeEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeData>[] is M) {
-      return data.map<RewardsHomeData>((Map<String, dynamic> e) =>
-          RewardsHomeData.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeData>((Map<String, dynamic> e) => RewardsHomeData.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeDataRewards>[] is M) {
-      return data.map<RewardsHomeDataRewards>((Map<String, dynamic> e) =>
-          RewardsHomeDataRewards.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeDataRewards>((Map<String, dynamic> e) => RewardsHomeDataRewards.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeTesEntity>[] is M) {
-      return data.map<RewardsHomeTesEntity>((Map<String, dynamic> e) =>
-          RewardsHomeTesEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeTesEntity>((Map<String, dynamic> e) => RewardsHomeTesEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeTesRewards>[] is M) {
-      return data.map<RewardsHomeTesRewards>((Map<String, dynamic> e) =>
-          RewardsHomeTesRewards.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeTesRewards>((Map<String, dynamic> e) => RewardsHomeTesRewards.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeTestEntity>[] is M) {
-      return data.map<RewardsHomeTestEntity>((Map<String, dynamic> e) =>
-          RewardsHomeTestEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeTestEntity>((Map<String, dynamic> e) => RewardsHomeTestEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeTxEntity>[] is M) {
-      return data.map<RewardsHomeTxEntity>((Map<String, dynamic> e) =>
-          RewardsHomeTxEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeTxEntity>((Map<String, dynamic> e) => RewardsHomeTxEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsIndexEntity>[] is M) {
-      return data.map<RewardsIndexEntity>((Map<String, dynamic> e) =>
-          RewardsIndexEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsIndexEntity>((Map<String, dynamic> e) => RewardsIndexEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsIndexContinuous>[] is M) {
-      return data.map<RewardsIndexContinuous>((Map<String, dynamic> e) =>
-          RewardsIndexContinuous.fromJson(e)).toList() as M;
+      return data.map<RewardsIndexContinuous>((Map<String, dynamic> e) => RewardsIndexContinuous.fromJson(e)).toList() as M;
     }
     if (<RewardsIndexTasks>[] is M) {
-      return data.map<RewardsIndexTasks>((Map<String, dynamic> e) =>
-          RewardsIndexTasks.fromJson(e)).toList() as M;
+      return data.map<RewardsIndexTasks>((Map<String, dynamic> e) => RewardsIndexTasks.fromJson(e)).toList() as M;
     }
     if (<RewardsListEntity>[] is M) {
-      return data.map<RewardsListEntity>((Map<String, dynamic> e) =>
-          RewardsListEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsListEntity>((Map<String, dynamic> e) => RewardsListEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsListList>[] is M) {
-      return data.map<RewardsListList>((Map<String, dynamic> e) =>
-          RewardsListList.fromJson(e)).toList() as M;
+      return data.map<RewardsListList>((Map<String, dynamic> e) => RewardsListList.fromJson(e)).toList() as M;
     }
     if (<ServerTime>[] is M) {
-      return data.map<ServerTime>((Map<String, dynamic> e) =>
-          ServerTime.fromJson(e)).toList() as M;
+      return data.map<ServerTime>((Map<String, dynamic> e) => ServerTime.fromJson(e)).toList() as M;
     }
     if (<TextKonEntity>[] is M) {
-      return data.map<TextKonEntity>((Map<String, dynamic> e) =>
-          TextKonEntity.fromJson(e)).toList() as M;
+      return data.map<TextKonEntity>((Map<String, dynamic> e) => TextKonEntity.fromJson(e)).toList() as M;
     }
     if (<UserMeEntity>[] is M) {
-      return data.map<UserMeEntity>((Map<String, dynamic> e) =>
-          UserMeEntity.fromJson(e)).toList() as M;
+      return data.map<UserMeEntity>((Map<String, dynamic> e) => UserMeEntity.fromJson(e)).toList() as M;
     }
     if (<UserMeHouseholds>[] is M) {
-      return data.map<UserMeHouseholds>((Map<String, dynamic> e) =>
-          UserMeHouseholds.fromJson(e)).toList() as M;
+      return data.map<UserMeHouseholds>((Map<String, dynamic> e) => UserMeHouseholds.fromJson(e)).toList() as M;
     }
     if (<UserMeEstates>[] is M) {
-      return data.map<UserMeEstates>((Map<String, dynamic> e) =>
-          UserMeEstates.fromJson(e)).toList() as M;
+      return data.map<UserMeEstates>((Map<String, dynamic> e) => UserMeEstates.fromJson(e)).toList() as M;
     }
     if (<UserMeEstatesAccounts>[] is M) {
-      return data.map<UserMeEstatesAccounts>((Map<String, dynamic> e) =>
-          UserMeEstatesAccounts.fromJson(e)).toList() as M;
+      return data.map<UserMeEstatesAccounts>((Map<String, dynamic> e) => UserMeEstatesAccounts.fromJson(e)).toList() as M;
     }
     if (<UserMeEstatesAccountsUnit>[] is M) {
-      return data.map<UserMeEstatesAccountsUnit>((Map<String, dynamic> e) =>
-          UserMeEstatesAccountsUnit.fromJson(e)).toList() as M;
+      return data.map<UserMeEstatesAccountsUnit>((Map<String, dynamic> e) => UserMeEstatesAccountsUnit.fromJson(e)).toList() as M;
     }
     if (<UserMeDefaultUnit>[] is M) {
-      return data.map<UserMeDefaultUnit>((Map<String, dynamic> e) =>
-          UserMeDefaultUnit.fromJson(e)).toList() as M;
+      return data.map<UserMeDefaultUnit>((Map<String, dynamic> e) => UserMeDefaultUnit.fromJson(e)).toList() as M;
     }
     if (<UserMeInformation>[] is M) {
-      return data.map<UserMeInformation>((Map<String, dynamic> e) =>
-          UserMeInformation.fromJson(e)).toList() as M;
+      return data.map<UserMeInformation>((Map<String, dynamic> e) => UserMeInformation.fromJson(e)).toList() as M;
     }
     if (<VisitorPageEntity>[] is M) {
-      return data.map<VisitorPageEntity>((Map<String, dynamic> e) =>
-          VisitorPageEntity.fromJson(e)).toList() as M;
+      return data.map<VisitorPageEntity>((Map<String, dynamic> e) => VisitorPageEntity.fromJson(e)).toList() as M;
     }
     if (<VisitorPageList>[] is M) {
-      return data.map<VisitorPageList>((Map<String, dynamic> e) =>
-          VisitorPageList.fromJson(e)).toList() as M;
+      return data.map<VisitorPageList>((Map<String, dynamic> e) => VisitorPageList.fromJson(e)).toList() as M;
     }
 
     debugPrint("$M not found");
@@ -544,8 +475,7 @@ class JsonConvert {
       return json;
     }
     if (json is List) {
-      return _getListChildType<M>(
-          json.map((dynamic e) => e as Map<String, dynamic>).toList());
+      return _getListChildType<M>(json.map((dynamic e) => e as Map<String, dynamic>).toList());
     } else {
       return jsonConvert.convert<M>(json);
     }
@@ -559,17 +489,14 @@ class JsonConvertClassCollection {
     (FacilityBookEntity).toString(): FacilityBookEntity.fromJson,
     (FacilityBookFacilityType).toString(): FacilityBookFacilityType.fromJson,
     (FacilityBookFacilities).toString(): FacilityBookFacilities.fromJson,
-    (FacilityBookFacilitiesPeriods).toString(): FacilityBookFacilitiesPeriods
-        .fromJson,
+    (FacilityBookFacilitiesPeriods).toString(): FacilityBookFacilitiesPeriods.fromJson,
     (FacilityIndexEntity).toString(): FacilityIndexEntity.fromJson,
     (FacilityPageEntity).toString(): FacilityPageEntity.fromJson,
     (FacilityDetail).toString(): FacilityDetail.fromJson,
     (FacilityPageListBooking).toString(): FacilityPageListBooking.fromJson,
     (FacilityPageListFacility).toString(): FacilityPageListFacility.fromJson,
-    (FacilityPageListFacilityType).toString(): FacilityPageListFacilityType
-        .fromJson,
-    (FacilityPageListTimePeriod).toString(): FacilityPageListTimePeriod
-        .fromJson,
+    (FacilityPageListFacilityType).toString(): FacilityPageListFacilityType.fromJson,
+    (FacilityPageListTimePeriod).toString(): FacilityPageListTimePeriod.fromJson,
     (FacilityPageListAccount).toString(): FacilityPageListAccount.fromJson,
     (FeedbackDetailEntity).toString(): FeedbackDetailEntity.fromJson,
     (FeedbackDetailReplies).toString(): FeedbackDetailReplies.fromJson,
@@ -580,37 +507,36 @@ class JsonConvertClassCollection {
     (FormListEntity).toString(): FormListEntity.fromJson,
     (FormOptionEntity).toString(): FormOptionEntity.fromJson,
     (FormSubmittedEntity).toString(): FormSubmittedEntity.fromJson,
-    (FormSubmittedEstateOnlineForm).toString(): FormSubmittedEstateOnlineForm
-        .fromJson,
+    (FormSubmittedEstateOnlineForm).toString(): FormSubmittedEstateOnlineForm.fromJson,
     (FormSubmittedPageEntity).toString(): FormSubmittedPageEntity.fromJson,
-    (GarageSaleRentDetailEntity).toString(): GarageSaleRentDetailEntity
-        .fromJson,
-    (GarageSaleRentDetailAccount).toString(): GarageSaleRentDetailAccount
-        .fromJson,
+    (GarageSaleRentDetailEntity).toString(): GarageSaleRentDetailEntity.fromJson,
+    (GarageSaleRentDetailAccount).toString(): GarageSaleRentDetailAccount.fromJson,
     (GarageSaleRentEntity).toString(): GarageSaleRentEntity.fromJson,
     (GarageSaleRentList).toString(): GarageSaleRentList.fromJson,
     (GarageSaleRentListAccount).toString(): GarageSaleRentListAccount.fromJson,
+    (HomeListEntity).toString(): HomeListEntity.fromJson,
+    (HomeListBanners).toString(): HomeListBanners.fromJson,
+    (HomeListLatestTransactions).toString(): HomeListLatestTransactions.fromJson,
+    (HomeListPropertyNews).toString(): HomeListPropertyNews.fromJson,
     (IdNameEntity).toString(): IdNameEntity.fromJson,
+    (LatestNewsDetailEntity).toString(): LatestNewsDetailEntity.fromJson,
+    (LatestNewsPageEntity).toString(): LatestNewsPageEntity.fromJson,
+    (LatestNewsList).toString(): LatestNewsList.fromJson,
     (MyfollowingListEntity).toString(): MyfollowingListEntity.fromJson,
     (MypostsNewsfeedEntity).toString(): MypostsNewsfeedEntity.fromJson,
     (MypostsNewsfeedList).toString(): MypostsNewsfeedList.fromJson,
-    (MypostsNewsfeedListAccount).toString(): MypostsNewsfeedListAccount
-        .fromJson,
+    (MypostsNewsfeedListAccount).toString(): MypostsNewsfeedListAccount.fromJson,
     (MypostsSaleRentEntity).toString(): MypostsSaleRentEntity.fromJson,
     (MypostsSaleRentList).toString(): MypostsSaleRentList.fromJson,
-    (NewsfeedCommentPublishEntity).toString(): NewsfeedCommentPublishEntity
-        .fromJson,
+    (NewsfeedCommentPublishEntity).toString(): NewsfeedCommentPublishEntity.fromJson,
     (NewsfeedDetailEntity).toString(): NewsfeedDetailEntity.fromJson,
     (NewsfeedDetailAccount).toString(): NewsfeedDetailAccount.fromJson,
     (NewsfeedDetailComments).toString(): NewsfeedDetailComments.fromJson,
-    (NewsfeedDetailCommentsAccount).toString(): NewsfeedDetailCommentsAccount
-        .fromJson,
-    (NewsfeedDetailCommentsToAccount)
-        .toString(): NewsfeedDetailCommentsToAccount.fromJson,
+    (NewsfeedDetailCommentsAccount).toString(): NewsfeedDetailCommentsAccount.fromJson,
+    (NewsfeedDetailCommentsToAccount).toString(): NewsfeedDetailCommentsToAccount.fromJson,
     (NewsfeedFollowingEntity).toString(): NewsfeedFollowingEntity.fromJson,
     (NewsfeedFollowingList).toString(): NewsfeedFollowingList.fromJson,
-    (NewsfeedFollowingListAccount).toString(): NewsfeedFollowingListAccount
-        .fromJson,
+    (NewsfeedFollowingListAccount).toString(): NewsfeedFollowingListAccount.fromJson,
     (NewsfeedForyouEntity).toString(): NewsfeedForyouEntity.fromJson,
     (NewsfeedForyouList).toString(): NewsfeedForyouList.fromJson,
     (NewsfeedForyouListAccount).toString(): NewsfeedForyouListAccount.fromJson,
@@ -618,8 +544,7 @@ class JsonConvertClassCollection {
     (NewsfeedNewsList).toString(): NewsfeedNewsList.fromJson,
     (NewsfeedNewsListAccount).toString(): NewsfeedNewsListAccount.fromJson,
     (NoticeBoardAnnounEntity).toString(): NoticeBoardAnnounEntity.fromJson,
-    (NoticeBoardDocumentsEntity).toString(): NoticeBoardDocumentsEntity
-        .fromJson,
+    (NoticeBoardDocumentsEntity).toString(): NoticeBoardDocumentsEntity.fromJson,
     (NoticeBoardEventEntity).toString(): NoticeBoardEventEntity.fromJson,
     (PaymentPageEntity).toString(): PaymentPageEntity.fromJson,
     (PaymentPageList).toString(): PaymentPageList.fromJson,
@@ -629,8 +554,7 @@ class JsonConvertClassCollection {
     (PropertySaleRentEntity).toString(): PropertySaleRentEntity.fromJson,
     (PropertySaleRentList).toString(): PropertySaleRentList.fromJson,
     (RewardsCategoryEntity).toString(): RewardsCategoryEntity.fromJson,
-    (RewardsHistoryEarnedEntity).toString(): RewardsHistoryEarnedEntity
-        .fromJson,
+    (RewardsHistoryEarnedEntity).toString(): RewardsHistoryEarnedEntity.fromJson,
     (RewardsHomeEntity).toString(): RewardsHomeEntity.fromJson,
     (RewardsHomeData).toString(): RewardsHomeData.fromJson,
     (RewardsHomeDataRewards).toString(): RewardsHomeDataRewards.fromJson,

+ 14 - 31
packages/cs_domain/lib/generated/json/facility_book_entity.g.dart

@@ -7,22 +7,16 @@ FacilityBookEntity $FacilityBookEntityFromJson(Map<String, dynamic> json) {
   if (remainQuota != null) {
     facilityBookEntity.remainQuota = remainQuota;
   }
-  final String? quotaResetOn = jsonConvert.convert<String>(
-      json['quota_reset_on']);
+  final String? quotaResetOn = jsonConvert.convert<String>(json['quota_reset_on']);
   if (quotaResetOn != null) {
     facilityBookEntity.quotaResetOn = quotaResetOn;
   }
-  final FacilityBookFacilityType? facilityType = jsonConvert.convert<
-      FacilityBookFacilityType>(json['facility_type']);
+  final FacilityBookFacilityType? facilityType = jsonConvert.convert<FacilityBookFacilityType>(json['facility_type']);
   if (facilityType != null) {
     facilityBookEntity.facilityType = facilityType;
   }
-  final List<FacilityBookFacilities>? facilities = (json['facilities'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FacilityBookFacilities>(e) as FacilityBookFacilities)
-      .toList();
+  final List<FacilityBookFacilities>? facilities = (json['facilities'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FacilityBookFacilities>(e) as FacilityBookFacilities).toList();
   if (facilities != null) {
     facilityBookEntity.facilities = facilities;
   }
@@ -53,11 +47,9 @@ extension FacilityBookEntityExtension on FacilityBookEntity {
   }
 }
 
-FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(
-    Map<String, dynamic> json) {
+FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(Map<String, dynamic> json) {
   final FacilityBookFacilityType facilityBookFacilityType = FacilityBookFacilityType();
-  final int? bookAdvanceDays = jsonConvert.convert<int>(
-      json['book_advance_days']);
+  final int? bookAdvanceDays = jsonConvert.convert<int>(json['book_advance_days']);
   if (bookAdvanceDays != null) {
     facilityBookFacilityType.bookAdvanceDays = bookAdvanceDays;
   }
@@ -65,16 +57,14 @@ FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(
   if (quota != null) {
     facilityBookFacilityType.quota = quota;
   }
-  final String? quotaResetType = jsonConvert.convert<String>(
-      json['quota_reset_type']);
+  final String? quotaResetType = jsonConvert.convert<String>(json['quota_reset_type']);
   if (quotaResetType != null) {
     facilityBookFacilityType.quotaResetType = quotaResetType;
   }
   return facilityBookFacilityType;
 }
 
-Map<String, dynamic> $FacilityBookFacilityTypeToJson(
-    FacilityBookFacilityType entity) {
+Map<String, dynamic> $FacilityBookFacilityTypeToJson(FacilityBookFacilityType entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['book_advance_days'] = entity.bookAdvanceDays;
   data['quota'] = entity.quota;
@@ -95,8 +85,7 @@ extension FacilityBookFacilityTypeExtension on FacilityBookFacilityType {
   }
 }
 
-FacilityBookFacilities $FacilityBookFacilitiesFromJson(
-    Map<String, dynamic> json) {
+FacilityBookFacilities $FacilityBookFacilitiesFromJson(Map<String, dynamic> json) {
   final FacilityBookFacilities facilityBookFacilities = FacilityBookFacilities();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -106,19 +95,15 @@ FacilityBookFacilities $FacilityBookFacilitiesFromJson(
   if (name != null) {
     facilityBookFacilities.name = name;
   }
-  final List<FacilityBookFacilitiesPeriods>? periods = (json['periods'] as List<
-      dynamic>?)?.map(
-          (e) =>
-      jsonConvert.convert<FacilityBookFacilitiesPeriods>(
-          e) as FacilityBookFacilitiesPeriods).toList();
+  final List<FacilityBookFacilitiesPeriods>? periods = (json['periods'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FacilityBookFacilitiesPeriods>(e) as FacilityBookFacilitiesPeriods).toList();
   if (periods != null) {
     facilityBookFacilities.periods = periods;
   }
   return facilityBookFacilities;
 }
 
-Map<String, dynamic> $FacilityBookFacilitiesToJson(
-    FacilityBookFacilities entity) {
+Map<String, dynamic> $FacilityBookFacilitiesToJson(FacilityBookFacilities entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -139,8 +124,7 @@ extension FacilityBookFacilitiesExtension on FacilityBookFacilities {
   }
 }
 
-FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(
-    Map<String, dynamic> json) {
+FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(Map<String, dynamic> json) {
   final FacilityBookFacilitiesPeriods facilityBookFacilitiesPeriods = FacilityBookFacilitiesPeriods();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -173,8 +157,7 @@ FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(
   return facilityBookFacilitiesPeriods;
 }
 
-Map<String, dynamic> $FacilityBookFacilitiesPeriodsToJson(
-    FacilityBookFacilitiesPeriods entity) {
+Map<String, dynamic> $FacilityBookFacilitiesPeriodsToJson(FacilityBookFacilitiesPeriods entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['start'] = entity.start;

+ 9 - 1
packages/cs_domain/lib/generated/json/facility_index_entity.g.dart

@@ -15,6 +15,11 @@ FacilityIndexEntity $FacilityIndexEntityFromJson(Map<String, dynamic> json) {
   if (name != null) {
     facilityIndexEntity.name = name;
   }
+  final List<String>? mapResources = (json['map_resources'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<String>(e) as String).toList();
+  if (mapResources != null) {
+    facilityIndexEntity.mapResources = mapResources;
+  }
   return facilityIndexEntity;
 }
 
@@ -23,6 +28,7 @@ Map<String, dynamic> $FacilityIndexEntityToJson(FacilityIndexEntity entity) {
   data['id'] = entity.id;
   data['icon'] = entity.icon;
   data['name'] = entity.name;
+  data['map_resources'] = entity.mapResources;
   return data;
 }
 
@@ -31,10 +37,12 @@ extension FacilityIndexEntityExtension on FacilityIndexEntity {
     String? id,
     String? icon,
     String? name,
+    List<String>? mapResources,
   }) {
     return FacilityIndexEntity()
       ..id = id ?? this.id
       ..icon = icon ?? this.icon
-      ..name = name ?? this.name;
+      ..name = name ?? this.name
+      ..mapResources = mapResources ?? this.mapResources;
   }
 }

+ 20 - 40
packages/cs_domain/lib/generated/json/facility_page_entity.g.dart

@@ -19,15 +19,12 @@ FacilityPageEntity $FacilityPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     facilityPageEntity.countPage = countPage;
   }
-  final String? totalDeposit = jsonConvert.convert<String>(
-      json['total_deposit']);
+  final String? totalDeposit = jsonConvert.convert<String>(json['total_deposit']);
   if (totalDeposit != null) {
     facilityPageEntity.totalDeposit = totalDeposit;
   }
-  final List<FacilityDetail>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<FacilityDetail>(e) as FacilityDetail)
-      .toList();
+  final List<FacilityDetail>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FacilityDetail>(e) as FacilityDetail).toList();
   if (list != null) {
     facilityPageEntity.list = list;
   }
@@ -66,23 +63,19 @@ extension FacilityPageEntityExtension on FacilityPageEntity {
 
 FacilityDetail $FacilityDetailFromJson(Map<String, dynamic> json) {
   final FacilityDetail facilityDetail = FacilityDetail();
-  final FacilityPageListBooking? booking = jsonConvert.convert<
-      FacilityPageListBooking>(json['booking']);
+  final FacilityPageListBooking? booking = jsonConvert.convert<FacilityPageListBooking>(json['booking']);
   if (booking != null) {
     facilityDetail.booking = booking;
   }
-  final FacilityPageListFacility? facility = jsonConvert.convert<
-      FacilityPageListFacility>(json['facility']);
+  final FacilityPageListFacility? facility = jsonConvert.convert<FacilityPageListFacility>(json['facility']);
   if (facility != null) {
     facilityDetail.facility = facility;
   }
-  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<
-      FacilityPageListTimePeriod>(json['time_period']);
+  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<FacilityPageListTimePeriod>(json['time_period']);
   if (timePeriod != null) {
     facilityDetail.timePeriod = timePeriod;
   }
-  final FacilityPageListAccount? account = jsonConvert.convert<
-      FacilityPageListAccount>(json['account']);
+  final FacilityPageListAccount? account = jsonConvert.convert<FacilityPageListAccount>(json['account']);
   if (account != null) {
     facilityDetail.account = account;
   }
@@ -113,8 +106,7 @@ extension FacilityDetailExtension on FacilityDetail {
   }
 }
 
-FacilityPageListBooking $FacilityPageListBookingFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListBooking $FacilityPageListBookingFromJson(Map<String, dynamic> json) {
   final FacilityPageListBooking facilityPageListBooking = FacilityPageListBooking();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -136,21 +128,18 @@ FacilityPageListBooking $FacilityPageListBookingFromJson(
   if (depositPaid != null) {
     facilityPageListBooking.depositPaid = depositPaid;
   }
-  final String? depositRefund = jsonConvert.convert<String>(
-      json['deposit_refund']);
+  final String? depositRefund = jsonConvert.convert<String>(json['deposit_refund']);
   if (depositRefund != null) {
     facilityPageListBooking.depositRefund = depositRefund;
   }
-  final String? depositRefundAt = jsonConvert.convert<String>(
-      json['deposit_refund_at']);
+  final String? depositRefundAt = jsonConvert.convert<String>(json['deposit_refund_at']);
   if (depositRefundAt != null) {
     facilityPageListBooking.depositRefundAt = depositRefundAt;
   }
   return facilityPageListBooking;
 }
 
-Map<String, dynamic> $FacilityPageListBookingToJson(
-    FacilityPageListBooking entity) {
+Map<String, dynamic> $FacilityPageListBookingToJson(FacilityPageListBooking entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['date'] = entity.date;
@@ -183,8 +172,7 @@ extension FacilityPageListBookingExtension on FacilityPageListBooking {
   }
 }
 
-FacilityPageListFacility $FacilityPageListFacilityFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListFacility $FacilityPageListFacilityFromJson(Map<String, dynamic> json) {
   final FacilityPageListFacility facilityPageListFacility = FacilityPageListFacility();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -194,16 +182,14 @@ FacilityPageListFacility $FacilityPageListFacilityFromJson(
   if (name != null) {
     facilityPageListFacility.name = name;
   }
-  final FacilityPageListFacilityType? type = jsonConvert.convert<
-      FacilityPageListFacilityType>(json['type']);
+  final FacilityPageListFacilityType? type = jsonConvert.convert<FacilityPageListFacilityType>(json['type']);
   if (type != null) {
     facilityPageListFacility.type = type;
   }
   return facilityPageListFacility;
 }
 
-Map<String, dynamic> $FacilityPageListFacilityToJson(
-    FacilityPageListFacility entity) {
+Map<String, dynamic> $FacilityPageListFacilityToJson(FacilityPageListFacility entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -224,8 +210,7 @@ extension FacilityPageListFacilityExtension on FacilityPageListFacility {
   }
 }
 
-FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(Map<String, dynamic> json) {
   final FacilityPageListFacilityType facilityPageListFacilityType = FacilityPageListFacilityType();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -238,8 +223,7 @@ FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(
   return facilityPageListFacilityType;
 }
 
-Map<String, dynamic> $FacilityPageListFacilityTypeToJson(
-    FacilityPageListFacilityType entity) {
+Map<String, dynamic> $FacilityPageListFacilityTypeToJson(FacilityPageListFacilityType entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -257,8 +241,7 @@ extension FacilityPageListFacilityTypeExtension on FacilityPageListFacilityType
   }
 }
 
-FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(Map<String, dynamic> json) {
   final FacilityPageListTimePeriod facilityPageListTimePeriod = FacilityPageListTimePeriod();
   final String? price = jsonConvert.convert<String>(json['price']);
   if (price != null) {
@@ -271,8 +254,7 @@ FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(
   return facilityPageListTimePeriod;
 }
 
-Map<String, dynamic> $FacilityPageListTimePeriodToJson(
-    FacilityPageListTimePeriod entity) {
+Map<String, dynamic> $FacilityPageListTimePeriodToJson(FacilityPageListTimePeriod entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['price'] = entity.price;
   data['deposit'] = entity.deposit;
@@ -290,8 +272,7 @@ extension FacilityPageListTimePeriodExtension on FacilityPageListTimePeriod {
   }
 }
 
-FacilityPageListAccount $FacilityPageListAccountFromJson(
-    Map<String, dynamic> json) {
+FacilityPageListAccount $FacilityPageListAccountFromJson(Map<String, dynamic> json) {
   final FacilityPageListAccount facilityPageListAccount = FacilityPageListAccount();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -304,8 +285,7 @@ FacilityPageListAccount $FacilityPageListAccountFromJson(
   return facilityPageListAccount;
 }
 
-Map<String, dynamic> $FacilityPageListAccountToJson(
-    FacilityPageListAccount entity) {
+Map<String, dynamic> $FacilityPageListAccountToJson(FacilityPageListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 6 - 14
packages/cs_domain/lib/generated/json/feedback_detail_entity.g.dart

@@ -30,17 +30,12 @@ FeedbackDetailEntity $FeedbackDetailEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackDetailEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
-      json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
   if (category != null) {
     feedbackDetailEntity.category = category;
   }
-  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies)
-      .toList();
+  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies).toList();
   if (replies != null) {
     feedbackDetailEntity.replies = replies;
   }
@@ -83,8 +78,7 @@ extension FeedbackDetailEntityExtension on FeedbackDetailEntity {
   }
 }
 
-FeedbackDetailReplies $FeedbackDetailRepliesFromJson(
-    Map<String, dynamic> json) {
+FeedbackDetailReplies $FeedbackDetailRepliesFromJson(Map<String, dynamic> json) {
   final FeedbackDetailReplies feedbackDetailReplies = FeedbackDetailReplies();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -103,16 +97,14 @@ FeedbackDetailReplies $FeedbackDetailRepliesFromJson(
   if (createdAt != null) {
     feedbackDetailReplies.createdAt = createdAt;
   }
-  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(
-      json['accountable']);
+  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(json['accountable']);
   if (accountable != null) {
     feedbackDetailReplies.accountable = accountable;
   }
   return feedbackDetailReplies;
 }
 
-Map<String, dynamic> $FeedbackDetailRepliesToJson(
-    FeedbackDetailReplies entity) {
+Map<String, dynamic> $FeedbackDetailRepliesToJson(FeedbackDetailReplies entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

+ 3 - 7
packages/cs_domain/lib/generated/json/feedback_list_entity.g.dart

@@ -21,11 +21,8 @@ FeedbackListEntity $FeedbackListEntityFromJson(Map<String, dynamic> json) {
   if (limit != null) {
     feedbackListEntity.limit = limit;
   }
-  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity)
-      .toList();
+  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity).toList();
   if (list != null) {
     feedbackListEntity.list = list;
   }
@@ -81,8 +78,7 @@ FeedbackItemEntity $FeedbackItemEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackItemEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
-      json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
   if (category != null) {
     feedbackItemEntity.category = category;
   }

+ 23 - 46
packages/cs_domain/lib/generated/json/form_content_entity.g.dart

@@ -5,25 +5,20 @@ import 'dart:typed_data';
 
 FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   final FormContentEntity formContentEntity = FormContentEntity();
-  final String? typeOfApplication = jsonConvert.convert<String>(
-      json['type_of_application']);
+  final String? typeOfApplication = jsonConvert.convert<String>(json['type_of_application']);
   if (typeOfApplication != null) {
     formContentEntity.typeOfApplication = typeOfApplication;
   }
-  final String? notesToRecipient = jsonConvert.convert<String>(
-      json['notes_to_recipient']);
+  final String? notesToRecipient = jsonConvert.convert<String>(json['notes_to_recipient']);
   if (notesToRecipient != null) {
     formContentEntity.notesToRecipient = notesToRecipient;
   }
-  final String? notesToManagement = jsonConvert.convert<String>(
-      json['notes_to_management']);
+  final String? notesToManagement = jsonConvert.convert<String>(json['notes_to_management']);
   if (notesToManagement != null) {
     formContentEntity.notesToManagement = notesToManagement;
   }
-  final List<String>? attachments = (json['attachments'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<String>(e) as String)
-      .toList();
+  final List<String>? attachments = (json['attachments'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<String>(e) as String).toList();
   if (attachments != null) {
     formContentEntity.attachments = attachments;
   }
@@ -35,13 +30,11 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (signatureByteData != null) {
     formContentEntity.signatureByteData = signatureByteData;
   }
-  final String? ownershipStatus = jsonConvert.convert<String>(
-      json['ownership_status']);
+  final String? ownershipStatus = jsonConvert.convert<String>(json['ownership_status']);
   if (ownershipStatus != null) {
     formContentEntity.ownershipStatus = ownershipStatus;
   }
-  final String? vehicleNumber = jsonConvert.convert<String>(
-      json['vehicle_number']);
+  final String? vehicleNumber = jsonConvert.convert<String>(json['vehicle_number']);
   if (vehicleNumber != null) {
     formContentEntity.vehicleNumber = vehicleNumber;
   }
@@ -49,8 +42,7 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (iuNumber != null) {
     formContentEntity.iuNumber = iuNumber;
   }
-  final String? vehicleMakeModelColour = jsonConvert.convert<String>(
-      json['vehicle_make_model_colour']);
+  final String? vehicleMakeModelColour = jsonConvert.convert<String>(json['vehicle_make_model_colour']);
   if (vehicleMakeModelColour != null) {
     formContentEntity.vehicleMakeModelColour = vehicleMakeModelColour;
   }
@@ -62,33 +54,27 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (endDate != null) {
     formContentEntity.endDate = endDate;
   }
-  final String? timeOrArrival = jsonConvert.convert<String>(
-      json['time_or_arrival']);
+  final String? timeOrArrival = jsonConvert.convert<String>(json['time_or_arrival']);
   if (timeOrArrival != null) {
     formContentEntity.timeOrArrival = timeOrArrival;
   }
-  final String? movingCompany = jsonConvert.convert<String>(
-      json['moving_company']);
+  final String? movingCompany = jsonConvert.convert<String>(json['moving_company']);
   if (movingCompany != null) {
     formContentEntity.movingCompany = movingCompany;
   }
-  final String? personInCharge = jsonConvert.convert<String>(
-      json['person_in_charge']);
+  final String? personInCharge = jsonConvert.convert<String>(json['person_in_charge']);
   if (personInCharge != null) {
     formContentEntity.personInCharge = personInCharge;
   }
-  final String? mobileNumber = jsonConvert.convert<String>(
-      json['mobile_number']);
+  final String? mobileNumber = jsonConvert.convert<String>(json['mobile_number']);
   if (mobileNumber != null) {
     formContentEntity.mobileNumber = mobileNumber;
   }
-  final String? companyAddress = jsonConvert.convert<String>(
-      json['company_address']);
+  final String? companyAddress = jsonConvert.convert<String>(json['company_address']);
   if (companyAddress != null) {
     formContentEntity.companyAddress = companyAddress;
   }
-  final String? dateOfEntry = jsonConvert.convert<String>(
-      json['date_of_entry']);
+  final String? dateOfEntry = jsonConvert.convert<String>(json['date_of_entry']);
   if (dateOfEntry != null) {
     formContentEntity.dateOfEntry = dateOfEntry;
   }
@@ -96,38 +82,31 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (guestName != null) {
     formContentEntity.guestName = guestName;
   }
-  final String? guestMobileNumber = jsonConvert.convert<String>(
-      json['guest_mobile_number']);
+  final String? guestMobileNumber = jsonConvert.convert<String>(json['guest_mobile_number']);
   if (guestMobileNumber != null) {
     formContentEntity.guestMobileNumber = guestMobileNumber;
   }
-  final String? renovationStartDate = jsonConvert.convert<String>(
-      json['renovation_start_date']);
+  final String? renovationStartDate = jsonConvert.convert<String>(json['renovation_start_date']);
   if (renovationStartDate != null) {
     formContentEntity.renovationStartDate = renovationStartDate;
   }
-  final String? renovationEndDate = jsonConvert.convert<String>(
-      json['renovation_end_date']);
+  final String? renovationEndDate = jsonConvert.convert<String>(json['renovation_end_date']);
   if (renovationEndDate != null) {
     formContentEntity.renovationEndDate = renovationEndDate;
   }
-  final String? hackingStartDate = jsonConvert.convert<String>(
-      json['hacking_start_date']);
+  final String? hackingStartDate = jsonConvert.convert<String>(json['hacking_start_date']);
   if (hackingStartDate != null) {
     formContentEntity.hackingStartDate = hackingStartDate;
   }
-  final String? hackingEndDate = jsonConvert.convert<String>(
-      json['hacking_end_date']);
+  final String? hackingEndDate = jsonConvert.convert<String>(json['hacking_end_date']);
   if (hackingEndDate != null) {
     formContentEntity.hackingEndDate = hackingEndDate;
   }
-  final String? renovationCompany = jsonConvert.convert<String>(
-      json['renovation_company']);
+  final String? renovationCompany = jsonConvert.convert<String>(json['renovation_company']);
   if (renovationCompany != null) {
     formContentEntity.renovationCompany = renovationCompany;
   }
-  final String? listOfRenovationWorks = jsonConvert.convert<String>(
-      json['list_of_renovation_works']);
+  final String? listOfRenovationWorks = jsonConvert.convert<String>(json['list_of_renovation_works']);
   if (listOfRenovationWorks != null) {
     formContentEntity.listOfRenovationWorks = listOfRenovationWorks;
   }
@@ -204,8 +183,7 @@ extension FormContentEntityExtension on FormContentEntity {
       ..ownershipStatus = ownershipStatus ?? this.ownershipStatus
       ..vehicleNumber = vehicleNumber ?? this.vehicleNumber
       ..iuNumber = iuNumber ?? this.iuNumber
-      ..vehicleMakeModelColour = vehicleMakeModelColour ??
-          this.vehicleMakeModelColour
+      ..vehicleMakeModelColour = vehicleMakeModelColour ?? this.vehicleMakeModelColour
       ..startDate = startDate ?? this.startDate
       ..endDate = endDate ?? this.endDate
       ..timeOrArrival = timeOrArrival ?? this.timeOrArrival
@@ -221,7 +199,6 @@ extension FormContentEntityExtension on FormContentEntity {
       ..hackingStartDate = hackingStartDate ?? this.hackingStartDate
       ..hackingEndDate = hackingEndDate ?? this.hackingEndDate
       ..renovationCompany = renovationCompany ?? this.renovationCompany
-      ..listOfRenovationWorks = listOfRenovationWorks ??
-          this.listOfRenovationWorks;
+      ..listOfRenovationWorks = listOfRenovationWorks ?? this.listOfRenovationWorks;
   }
 }

+ 1 - 2
packages/cs_domain/lib/generated/json/form_detail_entity.g.dart

@@ -13,8 +13,7 @@ FormDetailEntity $FormDetailEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formDetailEntity.userId = userId;
   }
-  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(
-      json['content']);
+  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(json['content']);
   if (content != null) {
     formDetailEntity.content = content;
   }

+ 1 - 2
packages/cs_domain/lib/generated/json/form_list_entity.g.dart

@@ -7,8 +7,7 @@ FormListEntity $FormListEntityFromJson(Map<String, dynamic> json) {
   if (id != null) {
     formListEntity.id = id;
   }
-  final String? typeId = jsonConvert.convert<String>(
-      json['online_form_type_id']);
+  final String? typeId = jsonConvert.convert<String>(json['online_form_type_id']);
   if (typeId != null) {
     formListEntity.typeId = typeId;
   }

+ 2 - 4
packages/cs_domain/lib/generated/json/form_option_entity.g.dart

@@ -3,14 +3,12 @@ import 'package:domain/entity/form_option_entity.dart';
 
 FormOptionEntity $FormOptionEntityFromJson(Map<String, dynamic> json) {
   final FormOptionEntity formOptionEntity = FormOptionEntity();
-  final List<String>? typeOfApplication = (json['type_of_application'] as List<
-      dynamic>?)?.map(
+  final List<String>? typeOfApplication = (json['type_of_application'] as List<dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (typeOfApplication != null) {
     formOptionEntity.typeOfApplication = typeOfApplication;
   }
-  final List<String>? ownershipStatus = (json['ownership_status'] as List<
-      dynamic>?)?.map(
+  final List<String>? ownershipStatus = (json['ownership_status'] as List<dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (ownershipStatus != null) {
     formOptionEntity.ownershipStatus = ownershipStatus;

+ 6 - 12
packages/cs_domain/lib/generated/json/form_submitted_entity.g.dart

@@ -15,13 +15,11 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formSubmittedEntity.userId = userId;
   }
-  final String? estateOnlineFormId = jsonConvert.convert<String>(
-      json['estate_online_form_id']);
+  final String? estateOnlineFormId = jsonConvert.convert<String>(json['estate_online_form_id']);
   if (estateOnlineFormId != null) {
     formSubmittedEntity.estateOnlineFormId = estateOnlineFormId;
   }
-  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(
-      json['content']);
+  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(json['content']);
   if (content != null) {
     formSubmittedEntity.content = content;
   }
@@ -37,13 +35,11 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (approvedOn != null) {
     formSubmittedEntity.approvedOn = approvedOn;
   }
-  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<
-      FormSubmittedEstateOnlineForm>(json['estate_online_form']);
+  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<FormSubmittedEstateOnlineForm>(json['estate_online_form']);
   if (estateOnlineForm != null) {
     formSubmittedEntity.estateOnlineForm = estateOnlineForm;
   }
-  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(
-      json['account']);
+  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(json['account']);
   if (account != null) {
     formSubmittedEntity.account = account;
   }
@@ -89,8 +85,7 @@ extension FormSubmittedEntityExtension on FormSubmittedEntity {
   }
 }
 
-FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(
-    Map<String, dynamic> json) {
+FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(Map<String, dynamic> json) {
   final FormSubmittedEstateOnlineForm formSubmittedEstateOnlineForm = FormSubmittedEstateOnlineForm();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -111,8 +106,7 @@ FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(
   return formSubmittedEstateOnlineForm;
 }
 
-Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(
-    FormSubmittedEstateOnlineForm entity) {
+Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(FormSubmittedEstateOnlineForm entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['icon'] = entity.icon;

+ 4 - 9
packages/cs_domain/lib/generated/json/form_submitted_page_entity.g.dart

@@ -3,8 +3,7 @@ import 'package:domain/entity/form_submitted_page_entity.dart';
 import 'package:domain/entity/form_submitted_entity.dart';
 
 
-FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(
-    Map<String, dynamic> json) {
+FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(Map<String, dynamic> json) {
   final FormSubmittedPageEntity formSubmittedPageEntity = FormSubmittedPageEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -22,19 +21,15 @@ FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(
   if (countPage != null) {
     formSubmittedPageEntity.countPage = countPage;
   }
-  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity)
-      .toList();
+  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity).toList();
   if (list != null) {
     formSubmittedPageEntity.list = list;
   }
   return formSubmittedPageEntity;
 }
 
-Map<String, dynamic> $FormSubmittedPageEntityToJson(
-    FormSubmittedPageEntity entity) {
+Map<String, dynamic> $FormSubmittedPageEntityToJson(FormSubmittedPageEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 5 - 10
packages/cs_domain/lib/generated/json/garage_sale_rent_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
 
-GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(
-    Map<String, dynamic> json) {
+GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(Map<String, dynamic> json) {
   final GarageSaleRentDetailEntity garageSaleRentDetailEntity = GarageSaleRentDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -37,16 +36,14 @@ GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(
   if (contact != null) {
     garageSaleRentDetailEntity.contact = contact;
   }
-  final GarageSaleRentDetailAccount? account = jsonConvert.convert<
-      GarageSaleRentDetailAccount>(json['account']);
+  final GarageSaleRentDetailAccount? account = jsonConvert.convert<GarageSaleRentDetailAccount>(json['account']);
   if (account != null) {
     garageSaleRentDetailEntity.account = account;
   }
   return garageSaleRentDetailEntity;
 }
 
-Map<String, dynamic> $GarageSaleRentDetailEntityToJson(
-    GarageSaleRentDetailEntity entity) {
+Map<String, dynamic> $GarageSaleRentDetailEntityToJson(GarageSaleRentDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;
@@ -85,8 +82,7 @@ extension GarageSaleRentDetailEntityExtension on GarageSaleRentDetailEntity {
   }
 }
 
-GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(
-    Map<String, dynamic> json) {
+GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(Map<String, dynamic> json) {
   final GarageSaleRentDetailAccount garageSaleRentDetailAccount = GarageSaleRentDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -103,8 +99,7 @@ GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(
   return garageSaleRentDetailAccount;
 }
 
-Map<String, dynamic> $GarageSaleRentDetailAccountToJson(
-    GarageSaleRentDetailAccount entity) {
+Map<String, dynamic> $GarageSaleRentDetailAccountToJson(GarageSaleRentDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 5 - 11
packages/cs_domain/lib/generated/json/garage_sale_rent_entity.g.dart

@@ -19,11 +19,8 @@ GarageSaleRentEntity $GarageSaleRentEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     garageSaleRentEntity.countPage = countPage;
   }
-  final List<GarageSaleRentList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<GarageSaleRentList>(e) as GarageSaleRentList)
-      .toList();
+  final List<GarageSaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<GarageSaleRentList>(e) as GarageSaleRentList).toList();
   if (list != null) {
     garageSaleRentEntity.list = list;
   }
@@ -88,8 +85,7 @@ GarageSaleRentList $GarageSaleRentListFromJson(Map<String, dynamic> json) {
   if (likesCount != null) {
     garageSaleRentList.likesCount = likesCount;
   }
-  final GarageSaleRentListAccount? account = jsonConvert.convert<
-      GarageSaleRentListAccount>(json['account']);
+  final GarageSaleRentListAccount? account = jsonConvert.convert<GarageSaleRentListAccount>(json['account']);
   if (account != null) {
     garageSaleRentList.account = account;
   }
@@ -132,8 +128,7 @@ extension GarageSaleRentListExtension on GarageSaleRentList {
   }
 }
 
-GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(
-    Map<String, dynamic> json) {
+GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(Map<String, dynamic> json) {
   final GarageSaleRentListAccount garageSaleRentListAccount = GarageSaleRentListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -150,8 +145,7 @@ GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(
   return garageSaleRentListAccount;
 }
 
-Map<String, dynamic> $GarageSaleRentListAccountToJson(
-    GarageSaleRentListAccount entity) {
+Map<String, dynamic> $GarageSaleRentListAccountToJson(GarageSaleRentListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 178 - 0
packages/cs_domain/lib/generated/json/home_list_entity.g.dart

@@ -0,0 +1,178 @@
+import 'package:domain/generated/json/base/json_convert_content.dart';
+import 'package:domain/entity/home_list_entity.dart';
+
+HomeListEntity $HomeListEntityFromJson(Map<String, dynamic> json) {
+  final HomeListEntity homeListEntity = HomeListEntity();
+  final List<HomeListBanners>? banners = (json['banners'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<HomeListBanners>(e) as HomeListBanners).toList();
+  if (banners != null) {
+    homeListEntity.banners = banners;
+  }
+  final List<HomeListLatestTransactions>? latestTransactions = (json['latest_transactions'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<HomeListLatestTransactions>(e) as HomeListLatestTransactions).toList();
+  if (latestTransactions != null) {
+    homeListEntity.latestTransactions = latestTransactions;
+  }
+  final List<HomeListPropertyNews>? propertyNews = (json['property_news'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews).toList();
+  if (propertyNews != null) {
+    homeListEntity.propertyNews = propertyNews;
+  }
+  return homeListEntity;
+}
+
+Map<String, dynamic> $HomeListEntityToJson(HomeListEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['banners'] = entity.banners.map((v) => v.toJson()).toList();
+  data['latest_transactions'] = entity.latestTransactions.map((v) => v.toJson()).toList();
+  data['property_news'] = entity.propertyNews.map((v) => v.toJson()).toList();
+  return data;
+}
+
+extension HomeListEntityExtension on HomeListEntity {
+  HomeListEntity copyWith({
+    List<HomeListBanners>? banners,
+    List<HomeListLatestTransactions>? latestTransactions,
+    List<HomeListPropertyNews>? propertyNews,
+  }) {
+    return HomeListEntity()
+      ..banners = banners ?? this.banners
+      ..latestTransactions = latestTransactions ?? this.latestTransactions
+      ..propertyNews = propertyNews ?? this.propertyNews;
+  }
+}
+
+HomeListBanners $HomeListBannersFromJson(Map<String, dynamic> json) {
+  final HomeListBanners homeListBanners = HomeListBanners();
+  final String? id = jsonConvert.convert<String>(json['id']);
+  if (id != null) {
+    homeListBanners.id = id;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    homeListBanners.name = name;
+  }
+  final String? image = jsonConvert.convert<String>(json['image']);
+  if (image != null) {
+    homeListBanners.image = image;
+  }
+  return homeListBanners;
+}
+
+Map<String, dynamic> $HomeListBannersToJson(HomeListBanners entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['name'] = entity.name;
+  data['image'] = entity.image;
+  return data;
+}
+
+extension HomeListBannersExtension on HomeListBanners {
+  HomeListBanners copyWith({
+    String? id,
+    String? name,
+    String? image,
+  }) {
+    return HomeListBanners()
+      ..id = id ?? this.id
+      ..name = name ?? this.name
+      ..image = image ?? this.image;
+  }
+}
+
+HomeListLatestTransactions $HomeListLatestTransactionsFromJson(Map<String, dynamic> json) {
+  final HomeListLatestTransactions homeListLatestTransactions = HomeListLatestTransactions();
+  final String? id = jsonConvert.convert<String>(json['id']);
+  if (id != null) {
+    homeListLatestTransactions.id = id;
+  }
+  final int? type = jsonConvert.convert<int>(json['type']);
+  if (type != null) {
+    homeListLatestTransactions.type = type;
+  }
+  final String? title = jsonConvert.convert<String>(json['title']);
+  if (title != null) {
+    homeListLatestTransactions.title = title;
+  }
+  final String? price = jsonConvert.convert<String>(json['price']);
+  if (price != null) {
+    homeListLatestTransactions.price = price;
+  }
+  final String? createdAt = jsonConvert.convert<String>(json['created_at']);
+  if (createdAt != null) {
+    homeListLatestTransactions.createdAt = createdAt;
+  }
+  return homeListLatestTransactions;
+}
+
+Map<String, dynamic> $HomeListLatestTransactionsToJson(HomeListLatestTransactions entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['type'] = entity.type;
+  data['title'] = entity.title;
+  data['price'] = entity.price;
+  data['created_at'] = entity.createdAt;
+  return data;
+}
+
+extension HomeListLatestTransactionsExtension on HomeListLatestTransactions {
+  HomeListLatestTransactions copyWith({
+    String? id,
+    int? type,
+    String? title,
+    String? price,
+    String? createdAt,
+  }) {
+    return HomeListLatestTransactions()
+      ..id = id ?? this.id
+      ..type = type ?? this.type
+      ..title = title ?? this.title
+      ..price = price ?? this.price
+      ..createdAt = createdAt ?? this.createdAt;
+  }
+}
+
+HomeListPropertyNews $HomeListPropertyNewsFromJson(Map<String, dynamic> json) {
+  final HomeListPropertyNews homeListPropertyNews = HomeListPropertyNews();
+  final String? id = jsonConvert.convert<String>(json['id']);
+  if (id != null) {
+    homeListPropertyNews.id = id;
+  }
+  final String? title = jsonConvert.convert<String>(json['title']);
+  if (title != null) {
+    homeListPropertyNews.title = title;
+  }
+  final String? coverImage = jsonConvert.convert<String>(json['cover_image']);
+  if (coverImage != null) {
+    homeListPropertyNews.coverImage = coverImage;
+  }
+  final String? createdAt = jsonConvert.convert<String>(json['created_at']);
+  if (createdAt != null) {
+    homeListPropertyNews.createdAt = createdAt;
+  }
+  return homeListPropertyNews;
+}
+
+Map<String, dynamic> $HomeListPropertyNewsToJson(HomeListPropertyNews entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['title'] = entity.title;
+  data['cover_image'] = entity.coverImage;
+  data['created_at'] = entity.createdAt;
+  return data;
+}
+
+extension HomeListPropertyNewsExtension on HomeListPropertyNews {
+  HomeListPropertyNews copyWith({
+    String? id,
+    String? title,
+    String? coverImage,
+    String? createdAt,
+  }) {
+    return HomeListPropertyNews()
+      ..id = id ?? this.id
+      ..title = title ?? this.title
+      ..coverImage = coverImage ?? this.coverImage
+      ..createdAt = createdAt ?? this.createdAt;
+  }
+}

+ 61 - 0
packages/cs_domain/lib/generated/json/latest_news_detail_entity.g.dart

@@ -0,0 +1,61 @@
+import 'package:domain/generated/json/base/json_convert_content.dart';
+import 'package:domain/entity/latest_news_detail_entity.dart';
+
+LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(Map<String, dynamic> json) {
+  final LatestNewsDetailEntity latestNewsDetailEntity = LatestNewsDetailEntity();
+  final String? id = jsonConvert.convert<String>(json['id']);
+  if (id != null) {
+    latestNewsDetailEntity.id = id;
+  }
+  final int? type = jsonConvert.convert<int>(json['type']);
+  if (type != null) {
+    latestNewsDetailEntity.type = type;
+  }
+  final String? title = jsonConvert.convert<String>(json['title']);
+  if (title != null) {
+    latestNewsDetailEntity.title = title;
+  }
+  final String? coverImage = jsonConvert.convert<String>(json['cover_image']);
+  if (coverImage != null) {
+    latestNewsDetailEntity.coverImage = coverImage;
+  }
+  final String? content = jsonConvert.convert<String>(json['content']);
+  if (content != null) {
+    latestNewsDetailEntity.content = content;
+  }
+  final String? createdAt = jsonConvert.convert<String>(json['created_at']);
+  if (createdAt != null) {
+    latestNewsDetailEntity.createdAt = createdAt;
+  }
+  return latestNewsDetailEntity;
+}
+
+Map<String, dynamic> $LatestNewsDetailEntityToJson(LatestNewsDetailEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['type'] = entity.type;
+  data['title'] = entity.title;
+  data['cover_image'] = entity.coverImage;
+  data['content'] = entity.content;
+  data['created_at'] = entity.createdAt;
+  return data;
+}
+
+extension LatestNewsDetailEntityExtension on LatestNewsDetailEntity {
+  LatestNewsDetailEntity copyWith({
+    String? id,
+    int? type,
+    String? title,
+    String? coverImage,
+    String? content,
+    String? createdAt,
+  }) {
+    return LatestNewsDetailEntity()
+      ..id = id ?? this.id
+      ..type = type ?? this.type
+      ..title = title ?? this.title
+      ..coverImage = coverImage ?? this.coverImage
+      ..content = content ?? this.content
+      ..createdAt = createdAt ?? this.createdAt;
+  }
+}

+ 114 - 0
packages/cs_domain/lib/generated/json/latest_news_page_entity.g.dart

@@ -0,0 +1,114 @@
+import 'package:domain/generated/json/base/json_convert_content.dart';
+import 'package:domain/entity/latest_news_page_entity.dart';
+
+LatestNewsPageEntity $LatestNewsPageEntityFromJson(Map<String, dynamic> json) {
+  final LatestNewsPageEntity latestNewsPageEntity = LatestNewsPageEntity();
+  final int? count = jsonConvert.convert<int>(json['count']);
+  if (count != null) {
+    latestNewsPageEntity.count = count;
+  }
+  final int? page = jsonConvert.convert<int>(json['page']);
+  if (page != null) {
+    latestNewsPageEntity.page = page;
+  }
+  final int? limit = jsonConvert.convert<int>(json['limit']);
+  if (limit != null) {
+    latestNewsPageEntity.limit = limit;
+  }
+  final int? countPage = jsonConvert.convert<int>(json['count_page']);
+  if (countPage != null) {
+    latestNewsPageEntity.countPage = countPage;
+  }
+  final List<LatestNewsList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<LatestNewsList>(e) as LatestNewsList).toList();
+  if (list != null) {
+    latestNewsPageEntity.list = list;
+  }
+  return latestNewsPageEntity;
+}
+
+Map<String, dynamic> $LatestNewsPageEntityToJson(LatestNewsPageEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['count'] = entity.count;
+  data['page'] = entity.page;
+  data['limit'] = entity.limit;
+  data['count_page'] = entity.countPage;
+  data['list'] = entity.list?.map((v) => v.toJson()).toList();
+  return data;
+}
+
+extension LatestNewsPageEntityExtension on LatestNewsPageEntity {
+  LatestNewsPageEntity copyWith({
+    int? count,
+    int? page,
+    int? limit,
+    int? countPage,
+    List<LatestNewsList>? list,
+  }) {
+    return LatestNewsPageEntity()
+      ..count = count ?? this.count
+      ..page = page ?? this.page
+      ..limit = limit ?? this.limit
+      ..countPage = countPage ?? this.countPage
+      ..list = list ?? this.list;
+  }
+}
+
+LatestNewsList $LatestNewsListFromJson(Map<String, dynamic> json) {
+  final LatestNewsList latestNewsList = LatestNewsList();
+  final String? id = jsonConvert.convert<String>(json['id']);
+  if (id != null) {
+    latestNewsList.id = id;
+  }
+  final int? type = jsonConvert.convert<int>(json['type']);
+  if (type != null) {
+    latestNewsList.type = type;
+  }
+  final String? title = jsonConvert.convert<String>(json['title']);
+  if (title != null) {
+    latestNewsList.title = title;
+  }
+  final String? coverImage = jsonConvert.convert<String>(json['cover_image']);
+  if (coverImage != null) {
+    latestNewsList.coverImage = coverImage;
+  }
+  final String? content = jsonConvert.convert<String>(json['content']);
+  if (content != null) {
+    latestNewsList.content = content;
+  }
+  final String? createdAt = jsonConvert.convert<String>(json['created_at']);
+  if (createdAt != null) {
+    latestNewsList.createdAt = createdAt;
+  }
+  return latestNewsList;
+}
+
+Map<String, dynamic> $LatestNewsListToJson(LatestNewsList entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['type'] = entity.type;
+  data['title'] = entity.title;
+  data['cover_image'] = entity.coverImage;
+  data['content'] = entity.content;
+  data['created_at'] = entity.createdAt;
+  return data;
+}
+
+extension LatestNewsListExtension on LatestNewsList {
+  LatestNewsList copyWith({
+    String? id,
+    int? type,
+    String? title,
+    String? coverImage,
+    String? content,
+    String? createdAt,
+  }) {
+    return LatestNewsList()
+      ..id = id ?? this.id
+      ..type = type ?? this.type
+      ..title = title ?? this.title
+      ..coverImage = coverImage ?? this.coverImage
+      ..content = content ?? this.content
+      ..createdAt = createdAt ?? this.createdAt;
+  }
+}

+ 2 - 4
packages/cs_domain/lib/generated/json/myfollowing_list_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myfollowing_list_entity.dart';
 
-MyfollowingListEntity $MyfollowingListEntityFromJson(
-    Map<String, dynamic> json) {
+MyfollowingListEntity $MyfollowingListEntityFromJson(Map<String, dynamic> json) {
   final MyfollowingListEntity myfollowingListEntity = MyfollowingListEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -19,8 +18,7 @@ MyfollowingListEntity $MyfollowingListEntityFromJson(
   return myfollowingListEntity;
 }
 
-Map<String, dynamic> $MyfollowingListEntityToJson(
-    MyfollowingListEntity entity) {
+Map<String, dynamic> $MyfollowingListEntityToJson(MyfollowingListEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 7 - 15
packages/cs_domain/lib/generated/json/myposts_newsfeed_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myposts_newsfeed_entity.dart';
 
-MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(
-    Map<String, dynamic> json) {
+MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(Map<String, dynamic> json) {
   final MypostsNewsfeedEntity mypostsNewsfeedEntity = MypostsNewsfeedEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(
   if (countPage != null) {
     mypostsNewsfeedEntity.countPage = countPage;
   }
-  final List<MypostsNewsfeedList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<MypostsNewsfeedList>(e) as MypostsNewsfeedList)
-      .toList();
+  final List<MypostsNewsfeedList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<MypostsNewsfeedList>(e) as MypostsNewsfeedList).toList();
   if (list != null) {
     mypostsNewsfeedEntity.list = list;
   }
   return mypostsNewsfeedEntity;
 }
 
-Map<String, dynamic> $MypostsNewsfeedEntityToJson(
-    MypostsNewsfeedEntity entity) {
+Map<String, dynamic> $MypostsNewsfeedEntityToJson(MypostsNewsfeedEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -90,8 +85,7 @@ MypostsNewsfeedList $MypostsNewsfeedListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     mypostsNewsfeedList.createdAt = createdAt;
   }
-  final MypostsNewsfeedListAccount? account = jsonConvert.convert<
-      MypostsNewsfeedListAccount>(json['account']);
+  final MypostsNewsfeedListAccount? account = jsonConvert.convert<MypostsNewsfeedListAccount>(json['account']);
   if (account != null) {
     mypostsNewsfeedList.account = account;
   }
@@ -134,8 +128,7 @@ extension MypostsNewsfeedListExtension on MypostsNewsfeedList {
   }
 }
 
-MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(
-    Map<String, dynamic> json) {
+MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(Map<String, dynamic> json) {
   final MypostsNewsfeedListAccount mypostsNewsfeedListAccount = MypostsNewsfeedListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -156,8 +149,7 @@ MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(
   return mypostsNewsfeedListAccount;
 }
 
-Map<String, dynamic> $MypostsNewsfeedListAccountToJson(
-    MypostsNewsfeedListAccount entity) {
+Map<String, dynamic> $MypostsNewsfeedListAccountToJson(MypostsNewsfeedListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 4 - 9
packages/cs_domain/lib/generated/json/myposts_sale_rent_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myposts_sale_rent_entity.dart';
 
-MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(
-    Map<String, dynamic> json) {
+MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(Map<String, dynamic> json) {
   final MypostsSaleRentEntity mypostsSaleRentEntity = MypostsSaleRentEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(
   if (countPage != null) {
     mypostsSaleRentEntity.countPage = countPage;
   }
-  final List<MypostsSaleRentList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<MypostsSaleRentList>(e) as MypostsSaleRentList)
-      .toList();
+  final List<MypostsSaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<MypostsSaleRentList>(e) as MypostsSaleRentList).toList();
   if (list != null) {
     mypostsSaleRentEntity.list = list;
   }
   return mypostsSaleRentEntity;
 }
 
-Map<String, dynamic> $MypostsSaleRentEntityToJson(
-    MypostsSaleRentEntity entity) {
+Map<String, dynamic> $MypostsSaleRentEntityToJson(MypostsSaleRentEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 2 - 4
packages/cs_domain/lib/generated/json/newsfeed_comment_publish_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_comment_publish_entity.dart';
 
-NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(
-    Map<String, dynamic> json) {
+NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(Map<String, dynamic> json) {
   final NewsfeedCommentPublishEntity newsfeedCommentPublishEntity = NewsfeedCommentPublishEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -19,8 +18,7 @@ NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(
   return newsfeedCommentPublishEntity;
 }
 
-Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(
-    NewsfeedCommentPublishEntity entity) {
+Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(NewsfeedCommentPublishEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

+ 13 - 28
packages/cs_domain/lib/generated/json/newsfeed_detail_entity.g.dart

@@ -40,17 +40,12 @@ NewsfeedDetailEntity $NewsfeedDetailEntityFromJson(Map<String, dynamic> json) {
   if (liked != null) {
     newsfeedDetailEntity.liked = liked;
   }
-  final NewsfeedDetailAccount? account = jsonConvert.convert<
-      NewsfeedDetailAccount>(json['account']);
+  final NewsfeedDetailAccount? account = jsonConvert.convert<NewsfeedDetailAccount>(json['account']);
   if (account != null) {
     newsfeedDetailEntity.account = account;
   }
-  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments)
-      .toList();
+  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments).toList();
   if (comments != null) {
     newsfeedDetailEntity.comments = comments;
   }
@@ -102,8 +97,7 @@ extension NewsfeedDetailEntityExtension on NewsfeedDetailEntity {
   }
 }
 
-NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailAccount newsfeedDetailAccount = NewsfeedDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -124,8 +118,7 @@ NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(
   return newsfeedDetailAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailAccountToJson(
-    NewsfeedDetailAccount entity) {
+Map<String, dynamic> $NewsfeedDetailAccountToJson(NewsfeedDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -149,8 +142,7 @@ extension NewsfeedDetailAccountExtension on NewsfeedDetailAccount {
   }
 }
 
-NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailComments newsfeedDetailComments = NewsfeedDetailComments();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -164,21 +156,18 @@ NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(
   if (createdAt != null) {
     newsfeedDetailComments.createdAt = createdAt;
   }
-  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<
-      NewsfeedDetailCommentsAccount>(json['account']);
+  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<NewsfeedDetailCommentsAccount>(json['account']);
   if (account != null) {
     newsfeedDetailComments.account = account;
   }
-  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<
-      NewsfeedDetailCommentsToAccount>(json['to_account']);
+  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<NewsfeedDetailCommentsToAccount>(json['to_account']);
   if (toAccount != null) {
     newsfeedDetailComments.toAccount = toAccount;
   }
   return newsfeedDetailComments;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToJson(
-    NewsfeedDetailComments entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToJson(NewsfeedDetailComments entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -205,8 +194,7 @@ extension NewsfeedDetailCommentsExtension on NewsfeedDetailComments {
   }
 }
 
-NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailCommentsAccount newsfeedDetailCommentsAccount = NewsfeedDetailCommentsAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -223,8 +211,7 @@ NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(
   return newsfeedDetailCommentsAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(
-    NewsfeedDetailCommentsAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(NewsfeedDetailCommentsAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -245,8 +232,7 @@ extension NewsfeedDetailCommentsAccountExtension on NewsfeedDetailCommentsAccoun
   }
 }
 
-NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailCommentsToAccount newsfeedDetailCommentsToAccount = NewsfeedDetailCommentsToAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -263,8 +249,7 @@ NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(
   return newsfeedDetailCommentsToAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(
-    NewsfeedDetailCommentsToAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(NewsfeedDetailCommentsToAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 9 - 19
packages/cs_domain/lib/generated/json/newsfeed_following_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_following_entity.dart';
 
-NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(
-    Map<String, dynamic> json) {
+NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(Map<String, dynamic> json) {
   final NewsfeedFollowingEntity newsfeedFollowingEntity = NewsfeedFollowingEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(
   if (countPage != null) {
     newsfeedFollowingEntity.countPage = countPage;
   }
-  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList)
-      .toList();
+  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList).toList();
   if (list != null) {
     newsfeedFollowingEntity.list = list;
   }
   return newsfeedFollowingEntity;
 }
 
-Map<String, dynamic> $NewsfeedFollowingEntityToJson(
-    NewsfeedFollowingEntity entity) {
+Map<String, dynamic> $NewsfeedFollowingEntityToJson(NewsfeedFollowingEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -59,8 +54,7 @@ extension NewsfeedFollowingEntityExtension on NewsfeedFollowingEntity {
   }
 }
 
-NewsfeedFollowingList $NewsfeedFollowingListFromJson(
-    Map<String, dynamic> json) {
+NewsfeedFollowingList $NewsfeedFollowingListFromJson(Map<String, dynamic> json) {
   final NewsfeedFollowingList newsfeedFollowingList = NewsfeedFollowingList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -91,16 +85,14 @@ NewsfeedFollowingList $NewsfeedFollowingListFromJson(
   if (createdAt != null) {
     newsfeedFollowingList.createdAt = createdAt;
   }
-  final NewsfeedFollowingListAccount? account = jsonConvert.convert<
-      NewsfeedFollowingListAccount>(json['account']);
+  final NewsfeedFollowingListAccount? account = jsonConvert.convert<NewsfeedFollowingListAccount>(json['account']);
   if (account != null) {
     newsfeedFollowingList.account = account;
   }
   return newsfeedFollowingList;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListToJson(
-    NewsfeedFollowingList entity) {
+Map<String, dynamic> $NewsfeedFollowingListToJson(NewsfeedFollowingList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -136,8 +128,7 @@ extension NewsfeedFollowingListExtension on NewsfeedFollowingList {
   }
 }
 
-NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedFollowingListAccount newsfeedFollowingListAccount = NewsfeedFollowingListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -158,8 +149,7 @@ NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(
   return newsfeedFollowingListAccount;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListAccountToJson(
-    NewsfeedFollowingListAccount entity) {
+Map<String, dynamic> $NewsfeedFollowingListAccountToJson(NewsfeedFollowingListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 5 - 11
packages/cs_domain/lib/generated/json/newsfeed_foryou_entity.g.dart

@@ -19,11 +19,8 @@ NewsfeedForyouEntity $NewsfeedForyouEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedForyouEntity.countPage = countPage;
   }
-  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList)
-      .toList();
+  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList).toList();
   if (list != null) {
     newsfeedForyouEntity.list = list;
   }
@@ -88,8 +85,7 @@ NewsfeedForyouList $NewsfeedForyouListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedForyouList.createdAt = createdAt;
   }
-  final NewsfeedForyouListAccount? account = jsonConvert.convert<
-      NewsfeedForyouListAccount>(json['account']);
+  final NewsfeedForyouListAccount? account = jsonConvert.convert<NewsfeedForyouListAccount>(json['account']);
   if (account != null) {
     newsfeedForyouList.account = account;
   }
@@ -132,8 +128,7 @@ extension NewsfeedForyouListExtension on NewsfeedForyouList {
   }
 }
 
-NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedForyouListAccount newsfeedForyouListAccount = NewsfeedForyouListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -154,8 +149,7 @@ NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(
   return newsfeedForyouListAccount;
 }
 
-Map<String, dynamic> $NewsfeedForyouListAccountToJson(
-    NewsfeedForyouListAccount entity) {
+Map<String, dynamic> $NewsfeedForyouListAccountToJson(NewsfeedForyouListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 5 - 10
packages/cs_domain/lib/generated/json/newsfeed_news_entity.g.dart

@@ -19,10 +19,8 @@ NewsfeedNewsEntity $NewsfeedNewsEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedNewsEntity.countPage = countPage;
   }
-  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList)
-      .toList();
+  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList).toList();
   if (list != null) {
     newsfeedNewsEntity.list = list;
   }
@@ -87,8 +85,7 @@ NewsfeedNewsList $NewsfeedNewsListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedNewsList.createdAt = createdAt;
   }
-  final NewsfeedNewsListAccount? account = jsonConvert.convert<
-      NewsfeedNewsListAccount>(json['account']);
+  final NewsfeedNewsListAccount? account = jsonConvert.convert<NewsfeedNewsListAccount>(json['account']);
   if (account != null) {
     newsfeedNewsList.account = account;
   }
@@ -131,8 +128,7 @@ extension NewsfeedNewsListExtension on NewsfeedNewsList {
   }
 }
 
-NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedNewsListAccount newsfeedNewsListAccount = NewsfeedNewsListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -153,8 +149,7 @@ NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(
   return newsfeedNewsListAccount;
 }
 
-Map<String, dynamic> $NewsfeedNewsListAccountToJson(
-    NewsfeedNewsListAccount entity) {
+Map<String, dynamic> $NewsfeedNewsListAccountToJson(NewsfeedNewsListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 2 - 4
packages/cs_domain/lib/generated/json/notice_board_announ_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_announ_entity.dart';
 
-NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(Map<String, dynamic> json) {
   final NoticeBoardAnnounEntity noticeBoardAnnounEntity = NoticeBoardAnnounEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -28,8 +27,7 @@ NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(
   return noticeBoardAnnounEntity;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounEntityToJson(
-    NoticeBoardAnnounEntity entity) {
+Map<String, dynamic> $NoticeBoardAnnounEntityToJson(NoticeBoardAnnounEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 2 - 4
packages/cs_domain/lib/generated/json/notice_board_documents_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_documents_entity.dart';
 
-NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(Map<String, dynamic> json) {
   final NoticeBoardDocumentsEntity noticeBoardDocumentsEntity = NoticeBoardDocumentsEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -28,8 +27,7 @@ NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(
   return noticeBoardDocumentsEntity;
 }
 
-Map<String, dynamic> $NoticeBoardDocumentsEntityToJson(
-    NoticeBoardDocumentsEntity entity) {
+Map<String, dynamic> $NoticeBoardDocumentsEntityToJson(NoticeBoardDocumentsEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 2 - 4
packages/cs_domain/lib/generated/json/notice_board_event_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_event_entity.dart';
 
-NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(
-    Map<String, dynamic> json) {
+NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(Map<String, dynamic> json) {
   final NoticeBoardEventEntity noticeBoardEventEntity = NoticeBoardEventEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -28,8 +27,7 @@ NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(
   return noticeBoardEventEntity;
 }
 
-Map<String, dynamic> $NoticeBoardEventEntityToJson(
-    NoticeBoardEventEntity entity) {
+Map<String, dynamic> $NoticeBoardEventEntityToJson(NoticeBoardEventEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 2 - 4
packages/cs_domain/lib/generated/json/payment_page_entity.g.dart

@@ -19,10 +19,8 @@ PaymentPageEntity $PaymentPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     paymentPageEntity.countPage = countPage;
   }
-  final List<PaymentPageList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<PaymentPageList>(e) as PaymentPageList)
-      .toList();
+  final List<PaymentPageList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PaymentPageList>(e) as PaymentPageList).toList();
   if (list != null) {
     paymentPageEntity.list = list;
   }

+ 2 - 4
packages/cs_domain/lib/generated/json/property_news_detail_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/property_news_detail_entity.dart';
 
-PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(
-    Map<String, dynamic> json) {
+PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(Map<String, dynamic> json) {
   final PropertyNewsDetailEntity propertyNewsDetailEntity = PropertyNewsDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -35,8 +34,7 @@ PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(
   return propertyNewsDetailEntity;
 }
 
-Map<String, dynamic> $PropertyNewsDetailEntityToJson(
-    PropertyNewsDetailEntity entity) {
+Map<String, dynamic> $PropertyNewsDetailEntityToJson(PropertyNewsDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

+ 2 - 4
packages/cs_domain/lib/generated/json/property_news_entity.g.dart

@@ -19,10 +19,8 @@ PropertyNewsEntity $PropertyNewsEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     propertyNewsEntity.countPage = countPage;
   }
-  final List<PropertyNewsList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<PropertyNewsList>(e) as PropertyNewsList)
-      .toList();
+  final List<PropertyNewsList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PropertyNewsList>(e) as PropertyNewsList).toList();
   if (list != null) {
     propertyNewsEntity.list = list;
   }

+ 4 - 9
packages/cs_domain/lib/generated/json/property_sale_rent_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/property_sale_rent_entity.dart';
 
-PropertySaleRentEntity $PropertySaleRentEntityFromJson(
-    Map<String, dynamic> json) {
+PropertySaleRentEntity $PropertySaleRentEntityFromJson(Map<String, dynamic> json) {
   final PropertySaleRentEntity propertySaleRentEntity = PropertySaleRentEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ PropertySaleRentEntity $PropertySaleRentEntityFromJson(
   if (countPage != null) {
     propertySaleRentEntity.countPage = countPage;
   }
-  final List<PropertySaleRentList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<PropertySaleRentList>(e) as PropertySaleRentList)
-      .toList();
+  final List<PropertySaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PropertySaleRentList>(e) as PropertySaleRentList).toList();
   if (list != null) {
     propertySaleRentEntity.list = list;
   }
   return propertySaleRentEntity;
 }
 
-Map<String, dynamic> $PropertySaleRentEntityToJson(
-    PropertySaleRentEntity entity) {
+Map<String, dynamic> $PropertySaleRentEntityToJson(PropertySaleRentEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 2 - 4
packages/cs_domain/lib/generated/json/rewards_category_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_category_entity.dart';
 
-RewardsCategoryEntity $RewardsCategoryEntityFromJson(
-    Map<String, dynamic> json) {
+RewardsCategoryEntity $RewardsCategoryEntityFromJson(Map<String, dynamic> json) {
   final RewardsCategoryEntity rewardsCategoryEntity = RewardsCategoryEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -19,8 +18,7 @@ RewardsCategoryEntity $RewardsCategoryEntityFromJson(
   return rewardsCategoryEntity;
 }
 
-Map<String, dynamic> $RewardsCategoryEntityToJson(
-    RewardsCategoryEntity entity) {
+Map<String, dynamic> $RewardsCategoryEntityToJson(RewardsCategoryEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['icon'] = entity.icon;

+ 2 - 4
packages/cs_domain/lib/generated/json/rewards_history_earned_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_history_earned_entity.dart';
 
-RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(
-    Map<String, dynamic> json) {
+RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(Map<String, dynamic> json) {
   final RewardsHistoryEarnedEntity rewardsHistoryEarnedEntity = RewardsHistoryEarnedEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -28,8 +27,7 @@ RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(
   return rewardsHistoryEarnedEntity;
 }
 
-Map<String, dynamic> $RewardsHistoryEarnedEntityToJson(
-    RewardsHistoryEarnedEntity entity) {
+Map<String, dynamic> $RewardsHistoryEarnedEntityToJson(RewardsHistoryEarnedEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 6 - 14
packages/cs_domain/lib/generated/json/rewards_home_entity.g.dart

@@ -3,10 +3,8 @@ import 'package:domain/entity/rewards_home_entity.dart';
 
 RewardsHomeEntity $RewardsHomeEntityFromJson(Map<String, dynamic> json) {
   final RewardsHomeEntity rewardsHomeEntity = RewardsHomeEntity();
-  final List<RewardsHomeData>? data = (json['data'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<RewardsHomeData>(e) as RewardsHomeData)
-      .toList();
+  final List<RewardsHomeData>? data = (json['data'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsHomeData>(e) as RewardsHomeData).toList();
   if (data != null) {
     rewardsHomeEntity.data = data;
   }
@@ -52,12 +50,8 @@ RewardsHomeData $RewardsHomeDataFromJson(Map<String, dynamic> json) {
   if (name != null) {
     rewardsHomeData.name = name;
   }
-  final List<RewardsHomeDataRewards>? rewards = (json['rewards'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<RewardsHomeDataRewards>(e) as RewardsHomeDataRewards)
-      .toList();
+  final List<RewardsHomeDataRewards>? rewards = (json['rewards'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsHomeDataRewards>(e) as RewardsHomeDataRewards).toList();
   if (rewards != null) {
     rewardsHomeData.rewards = rewards;
   }
@@ -85,8 +79,7 @@ extension RewardsHomeDataExtension on RewardsHomeData {
   }
 }
 
-RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(
-    Map<String, dynamic> json) {
+RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(Map<String, dynamic> json) {
   final RewardsHomeDataRewards rewardsHomeDataRewards = RewardsHomeDataRewards();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -112,8 +105,7 @@ RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(
   return rewardsHomeDataRewards;
 }
 
-Map<String, dynamic> $RewardsHomeDataRewardsToJson(
-    RewardsHomeDataRewards entity) {
+Map<String, dynamic> $RewardsHomeDataRewardsToJson(RewardsHomeDataRewards entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 5 - 12
packages/cs_domain/lib/generated/json/rewards_home_tes_entity.g.dart

@@ -11,12 +11,8 @@ RewardsHomeTesEntity $RewardsHomeTesEntityFromJson(Map<String, dynamic> json) {
   if (name != null) {
     rewardsHomeTesEntity.name = name;
   }
-  final List<RewardsHomeTesRewards>? rewards = (json['rewards'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<RewardsHomeTesRewards>(e) as RewardsHomeTesRewards)
-      .toList();
+  final List<RewardsHomeTesRewards>? rewards = (json['rewards'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsHomeTesRewards>(e) as RewardsHomeTesRewards).toList();
   if (rewards != null) {
     rewardsHomeTesEntity.rewards = rewards;
   }
@@ -44,8 +40,7 @@ extension RewardsHomeTesEntityExtension on RewardsHomeTesEntity {
   }
 }
 
-RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(
-    Map<String, dynamic> json) {
+RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(Map<String, dynamic> json) {
   final RewardsHomeTesRewards rewardsHomeTesRewards = RewardsHomeTesRewards();
   final double? id = jsonConvert.convert<double>(json['id']);
   if (id != null) {
@@ -60,8 +55,7 @@ RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(
   if (resources != null) {
     rewardsHomeTesRewards.resources = resources;
   }
-  final double? originalPoint = jsonConvert.convert<double>(
-      json['original_point']);
+  final double? originalPoint = jsonConvert.convert<double>(json['original_point']);
   if (originalPoint != null) {
     rewardsHomeTesRewards.originalPoint = originalPoint;
   }
@@ -72,8 +66,7 @@ RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(
   return rewardsHomeTesRewards;
 }
 
-Map<String, dynamic> $RewardsHomeTesRewardsToJson(
-    RewardsHomeTesRewards entity) {
+Map<String, dynamic> $RewardsHomeTesRewardsToJson(RewardsHomeTesRewards entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 2 - 4
packages/cs_domain/lib/generated/json/rewards_home_test_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_home_test_entity.dart';
 
-RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(
-    Map<String, dynamic> json) {
+RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(Map<String, dynamic> json) {
   final RewardsHomeTestEntity rewardsHomeTestEntity = RewardsHomeTestEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -20,8 +19,7 @@ RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(
   return rewardsHomeTestEntity;
 }
 
-Map<String, dynamic> $RewardsHomeTestEntityToJson(
-    RewardsHomeTestEntity entity) {
+Map<String, dynamic> $RewardsHomeTestEntityToJson(RewardsHomeTestEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 5 - 11
packages/cs_domain/lib/generated/json/rewards_index_entity.g.dart

@@ -7,13 +7,11 @@ RewardsIndexEntity $RewardsIndexEntityFromJson(Map<String, dynamic> json) {
   if (points != null) {
     rewardsIndexEntity.points = points;
   }
-  final RewardsIndexContinuous? continuous = jsonConvert.convert<
-      RewardsIndexContinuous>(json['continuous']);
+  final RewardsIndexContinuous? continuous = jsonConvert.convert<RewardsIndexContinuous>(json['continuous']);
   if (continuous != null) {
     rewardsIndexEntity.continuous = continuous;
   }
-  final RewardsIndexTasks? tasks = jsonConvert.convert<RewardsIndexTasks>(
-      json['tasks']);
+  final RewardsIndexTasks? tasks = jsonConvert.convert<RewardsIndexTasks>(json['tasks']);
   if (tasks != null) {
     rewardsIndexEntity.tasks = tasks;
   }
@@ -49,16 +47,13 @@ extension RewardsIndexEntityExtension on RewardsIndexEntity {
   }
 }
 
-RewardsIndexContinuous $RewardsIndexContinuousFromJson(
-    Map<String, dynamic> json) {
+RewardsIndexContinuous $RewardsIndexContinuousFromJson(Map<String, dynamic> json) {
   final RewardsIndexContinuous rewardsIndexContinuous = RewardsIndexContinuous();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
     rewardsIndexContinuous.count = count;
   }
-  final List<
-      dynamic>? currentWeekCheckin = (json['current_week_checkin'] as List<
-      dynamic>?)?.map(
+  final List<dynamic>? currentWeekCheckin = (json['current_week_checkin'] as List<dynamic>?)?.map(
           (e) => e).toList();
   if (currentWeekCheckin != null) {
     rewardsIndexContinuous.currentWeekCheckin = currentWeekCheckin;
@@ -66,8 +61,7 @@ RewardsIndexContinuous $RewardsIndexContinuousFromJson(
   return rewardsIndexContinuous;
 }
 
-Map<String, dynamic> $RewardsIndexContinuousToJson(
-    RewardsIndexContinuous entity) {
+Map<String, dynamic> $RewardsIndexContinuousToJson(RewardsIndexContinuous entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['current_week_checkin'] = entity.currentWeekCheckin;

+ 2 - 4
packages/cs_domain/lib/generated/json/rewards_list_entity.g.dart

@@ -19,10 +19,8 @@ RewardsListEntity $RewardsListEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     rewardsListEntity.countPage = countPage;
   }
-  final List<RewardsListList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<RewardsListList>(e) as RewardsListList)
-      .toList();
+  final List<RewardsListList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<RewardsListList>(e) as RewardsListList).toList();
   if (list != null) {
     rewardsListEntity.list = list;
   }

+ 15 - 33
packages/cs_domain/lib/generated/json/user_me_entity.g.dart

@@ -23,13 +23,11 @@ UserMeEntity $UserMeEntityFromJson(Map<String, dynamic> json) {
   if (email != null) {
     userMeEntity.email = email;
   }
-  final String? followsCount = jsonConvert.convert<String>(
-      json['follows_count']);
+  final String? followsCount = jsonConvert.convert<String>(json['follows_count']);
   if (followsCount != null) {
     userMeEntity.followsCount = followsCount;
   }
-  final String? flowersCount = jsonConvert.convert<String>(
-      json['flowers_count']);
+  final String? flowersCount = jsonConvert.convert<String>(json['flowers_count']);
   if (flowersCount != null) {
     userMeEntity.flowersCount = flowersCount;
   }
@@ -37,28 +35,21 @@ UserMeEntity $UserMeEntityFromJson(Map<String, dynamic> json) {
   if (postsCount != null) {
     userMeEntity.postsCount = postsCount;
   }
-  final List<UserMeHouseholds>? households = (json['households'] as List<
-      dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<UserMeHouseholds>(e) as UserMeHouseholds)
-      .toList();
+  final List<UserMeHouseholds>? households = (json['households'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeHouseholds>(e) as UserMeHouseholds).toList();
   if (households != null) {
     userMeEntity.households = households;
   }
-  final List<UserMeEstates>? estates = (json['estates'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<UserMeEstates>(e) as UserMeEstates)
-      .toList();
+  final List<UserMeEstates>? estates = (json['estates'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeEstates>(e) as UserMeEstates).toList();
   if (estates != null) {
     userMeEntity.estates = estates;
   }
-  final UserMeDefaultUnit? defaultUnit = jsonConvert.convert<UserMeDefaultUnit>(
-      json['default_unit']);
+  final UserMeDefaultUnit? defaultUnit = jsonConvert.convert<UserMeDefaultUnit>(json['default_unit']);
   if (defaultUnit != null) {
     userMeEntity.defaultUnit = defaultUnit;
   }
-  final UserMeInformation? information = jsonConvert.convert<UserMeInformation>(
-      json['information']);
+  final UserMeInformation? information = jsonConvert.convert<UserMeInformation>(json['information']);
   if (information != null) {
     userMeEntity.information = information;
   }
@@ -161,12 +152,8 @@ UserMeEstates $UserMeEstatesFromJson(Map<String, dynamic> json) {
   if (name != null) {
     userMeEstates.name = name;
   }
-  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts)
-      .toList();
+  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts).toList();
   if (accounts != null) {
     userMeEstates.accounts = accounts;
   }
@@ -194,8 +181,7 @@ extension UserMeEstatesExtension on UserMeEstates {
   }
 }
 
-UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(
-    Map<String, dynamic> json) {
+UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(Map<String, dynamic> json) {
   final UserMeEstatesAccounts userMeEstatesAccounts = UserMeEstatesAccounts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -221,16 +207,14 @@ UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(
   if (status != null) {
     userMeEstatesAccounts.status = status;
   }
-  final UserMeEstatesAccountsUnit? unit = jsonConvert.convert<
-      UserMeEstatesAccountsUnit>(json['unit']);
+  final UserMeEstatesAccountsUnit? unit = jsonConvert.convert<UserMeEstatesAccountsUnit>(json['unit']);
   if (unit != null) {
     userMeEstatesAccounts.unit = unit;
   }
   return userMeEstatesAccounts;
 }
 
-Map<String, dynamic> $UserMeEstatesAccountsToJson(
-    UserMeEstatesAccounts entity) {
+Map<String, dynamic> $UserMeEstatesAccountsToJson(UserMeEstatesAccounts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -263,8 +247,7 @@ extension UserMeEstatesAccountsExtension on UserMeEstatesAccounts {
   }
 }
 
-UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(
-    Map<String, dynamic> json) {
+UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(Map<String, dynamic> json) {
   final UserMeEstatesAccountsUnit userMeEstatesAccountsUnit = UserMeEstatesAccountsUnit();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -289,8 +272,7 @@ UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(
   return userMeEstatesAccountsUnit;
 }
 
-Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(
-    UserMeEstatesAccountsUnit entity) {
+Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(UserMeEstatesAccountsUnit entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['block'] = entity.block;

+ 3 - 6
packages/cs_domain/lib/generated/json/visitor_page_entity.g.dart

@@ -19,10 +19,8 @@ VisitorPageEntity $VisitorPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     visitorPageEntity.countPage = countPage;
   }
-  final List<VisitorPageList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<VisitorPageList>(e) as VisitorPageList)
-      .toList();
+  final List<VisitorPageList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<VisitorPageList>(e) as VisitorPageList).toList();
   if (list != null) {
     visitorPageEntity.list = list;
   }
@@ -74,8 +72,7 @@ VisitorPageList $VisitorPageListFromJson(Map<String, dynamic> json) {
   if (nric != null) {
     visitorPageList.nric = nric;
   }
-  final String? vehicleNumber = jsonConvert.convert<String>(
-      json['vehicle_number']);
+  final String? vehicleNumber = jsonConvert.convert<String>(json['vehicle_number']);
   if (vehicleNumber != null) {
     visitorPageList.vehicleNumber = vehicleNumber;
   }

+ 74 - 0
packages/cs_domain/lib/repository/main_repository.dart

@@ -1,4 +1,7 @@
 import 'package:domain/entity/feedback_detail_entity.dart';
+import 'package:domain/entity/home_list_entity.dart';
+import 'package:domain/entity/latest_news_detail_entity.dart';
+import 'package:domain/entity/latest_news_page_entity.dart';
 import 'package:domain/entity/visitor_page_entity.dart';
 import 'package:plugin_platform/platform_export.dart';
 import 'package:plugin_platform/http/dio_engine.dart';
@@ -214,4 +217,75 @@ class MainRepository {
     return result.convert();
   }
 
+  /// 首页列表的获取
+  Future<HttpResult<HomeListEntity>> fetchHomeIndex({
+    bool needLoading = true,
+    CancelToken? cancelToken,
+  }) async {
+    final result = await dioEngine.requestNetResult(
+      ApiConstants.apiHomeList,
+      method: HttpMethod.GET,
+      isShowLoadingDialog: needLoading,
+      networkDebounce: true,
+      cancelToken: cancelToken,
+    );
+
+    if (result.isSuccess) {
+      final json = result.getDataJson();
+      var data = HomeListEntity.fromJson(json!);
+      return result.convert<HomeListEntity>(data: data);
+    }
+    return result.convert();
+  }
+
+  /// 获取首页最新新闻的列表
+  Future<HttpResult<LatestNewsPageEntity>> fetchLatestNewsList({
+    required String type,
+    required int curPage,
+    CancelToken? cancelToken,
+  }) async {
+    Map<String, String> params = {};
+    params['page'] = curPage.toString();
+    params['limit'] = "10";
+    params['type'] = type.toString();
+
+    final result = await dioEngine.requestNetResult(
+      ApiConstants.apiLatestNewsList,
+      params: params,
+      method: HttpMethod.GET,
+      cancelToken: cancelToken,
+    );
+
+    if (result.isSuccess) {
+      final json = result.getDataJson();
+      var data = LatestNewsPageEntity.fromJson(json!);
+      return result.convert<LatestNewsPageEntity>(data: data);
+    }
+    return result.convert();
+  }
+
+  /// 获取首页最新新闻的详情
+  Future<HttpResult<LatestNewsDetailEntity>> fetchLatestNewsDetail({
+    required String id,
+    CancelToken? cancelToken,
+  }) async {
+    Map<String, String> params = {};
+    params['id'] = id;
+
+    final result = await dioEngine.requestNetResult(
+      ApiConstants.apiLatestNewsDetail,
+      params: params,
+      method: HttpMethod.GET,
+      isShowLoadingDialog: true,
+      networkDebounce: true,
+      cancelToken: cancelToken,
+    );
+
+    if (result.isSuccess) {
+      final json = result.getDataJson();
+      var data = LatestNewsDetailEntity.fromJson(json!);
+      return result.convert<LatestNewsDetailEntity>(data: data);
+    }
+    return result.convert();
+  }
 }

+ 4 - 2
packages/cs_plugin_basic/lib/dio_interceptors/interceptor_status_code_dio.dart

@@ -2,7 +2,9 @@
 import 'package:plugin_basic/provider/user_config/user_config_service.dart';
 import 'package:plugin_platform/platform_export.dart';
 import 'package:plugin_platform/engine/dialog/dialog_engine.dart';
+import 'package:router/componentRouter/component_service_manager.dart';
 import 'package:widgets/dialog/app_default_dialog.dart';
+import 'package:router/componentRouter/community_service.dart';
 
 /*
  * 特殊状态code处理的拦截器,
@@ -49,8 +51,8 @@ class StatusCodeDioInterceptors extends Interceptor {
           title: "Notice",
           message: "The login credential have expired, please log in again.",
           confirmAction: () {
-            // ComponentRouterServices.authService.startPopAllLoginPage();
-            print("去全局的登录页面");
+            //移除全部的页面并且跳转到登录页面
+            ComponentServiceManager().authService.startAndPopAllLoginPage();
           },
         ),
       );

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

@@ -1,4 +1,3 @@
-// export 'package:flutter_constraintlayout/flutter_constraintlayout.dart';
 export 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 export 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 export 'package:sticky_headers/sticky_headers.dart';