edge to edge 底部间距适配

packages/cpt_auth/lib/modules/reset_psd/reset_psd_page.dart

@@ -52,7 +52,7 @@ class _SignUpState extends BaseState<ResetPasswordPage, ResetPasswordController>
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Reset Password".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_auth/lib/modules/select_country/select_country_page.dart

@@ -37,7 +37,7 @@ class SelectCountryPage extends BaseStatelessPage<SelectCountryController> {
   Widget buildWidget(BuildContext context) {
     return Scaffold(
       body: SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_auth/lib/modules/setting/setting_page.dart

@@ -39,7 +39,7 @@ class SettingPage extends BaseStatelessPage<SettingController> {
       extendBodyBehindAppBar: true,
       appBar: MyAppBar.appBar(context, "Settings".tr),
       body: SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_auth/lib/modules/sign_up/sign_up_page.dart

@@ -52,7 +52,7 @@ class _SignUpState extends BaseState<SignUpPage, SignUpController> {
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Sign up".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_ms/lib/modules/job/sign_camera/sign_camera_page.dart

@@ -130,7 +130,7 @@ class _SignCameraPageState extends BaseState<SignCameraPage, SignCameraControlle
     return autoCtlGetBuilder(
       builder: (controller) {
         return SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_ms/lib/modules/job/sign_in_sign_out/sign_in_sign_out_page.dart

@@ -4,7 +4,6 @@ import 'package:cs_resources/constants/color_constants.dart';
 import 'package:cs_resources/generated/assets.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/src/services/predictive_back_event.dart';
 import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 import 'package:plugin_basic/base/base_stateful_page.dart';
@@ -93,7 +92,7 @@ class _SignInSignOutPageState extends BaseState<SignInSignOutPage, SignInSignOut
     return autoCtlGetBuilder(
       builder: (controller) {
         return SafeArea(
-          bottom: false,
+          bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_ms/lib/modules/main/main_page.dart

@@ -97,7 +97,7 @@ class _MainPageState extends BaseState<MSMainPage, MainController> with StateLif
         child: autoCtlGetBuilder(builder: (controller) {
           return Scaffold(
             body: SafeArea(
-              bottom: true,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
               top: false,
               //真正的 Content 布局,使用PageView保存状态
               child: Container(

packages/cpt_nl/lib/modules/job/sign_in_sign_out/sign_in_sign_out_page.dart

@@ -92,7 +92,7 @@ class _SignInSignOutPageState extends BaseState<SignInSignOutPage, SignInSignOut
     return autoCtlGetBuilder(
       builder: (controller) {
         return SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_nl/lib/modules/main/main_page.dart

@@ -98,7 +98,7 @@ class _MainPageState extends BaseState<NLMainPage, MainController> with StateLif
         child: autoCtlGetBuilder(builder: (controller) {
           return Scaffold(
             body: SafeArea(
-              bottom: true,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
               top: false,
               //真正的 Content 布局,使用PageView保存状态
               child: Container(

packages/cpt_sg/lib/modules/agency/agency_add/agency_add_page.dart

@@ -58,7 +58,7 @@ class SGAgencyAddPage extends BaseStatelessPage<AgencyAddController> {
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, Utils.isEmpty(state.agentId) ? "Add Agency".tr : "Edit Agency".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/agency/agency_category/agency_category_page.dart

@@ -46,7 +46,7 @@ class _LabourRequestListState extends BaseState<SGAgencyCategoryPage, AgencyCate
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/agency/agency_list/agency_list_page.dart

@@ -52,7 +52,7 @@ class _LabourRequestListState extends BaseState<SGAgencyListPage, AgencyListCont
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/agency/contract_add/contract_add_page.dart

@@ -64,7 +64,7 @@ class SGContractAddPage extends BaseStatelessPage<ContractAddController> {
                     ? "Edit Contract".tr
                     : "Renew Contract"),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/agency/contract_list/contract_list_page.dart

@@ -52,7 +52,7 @@ class _LabourRequestListState extends BaseState<SGContractListPage, ContractList
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/agency/contract_rate_edit_list/contract_rate_edit_list_page.dart

@@ -58,7 +58,7 @@ class _LabourRequestListState extends BaseState<SGContractRateEditListPage, Cont
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/agency/contract_rate_list/contract_rate_list_page.dart

@@ -57,7 +57,7 @@ class _LabourRequestListState extends BaseState<SGContractRateListPage, Contract
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/agency/contract_rate_setting/contract_rate_setting_page.dart

@@ -60,7 +60,7 @@ class ContractRateSettingPage extends BaseStatelessPage<ContractRateSettingContr
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, state.isAddType ? "Add New".tr : "Edit".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/agency/contract_rate_specific_day/contract_rate_specific_page.dart

@@ -58,7 +58,7 @@ class SGContractRateSpecificPage extends BaseStatelessPage<ContractRateSpecificC
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Specific Day".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/agency/position_add/position_add_page.dart

@@ -55,7 +55,7 @@ class SGPositionAddPage extends BaseStatelessPage<PositionAddController> {
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, Utils.isEmpty(state.positionId) ? "Add Position".tr : "Edit Position".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/agency/position_list/position_list_page.dart

@@ -52,7 +52,7 @@ class _LabourRequestListState extends BaseState<SGPositionListPage, PositionList
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/job/applied_staff/applied_staff_page.dart

@@ -54,7 +54,7 @@ class _AppliedStaffState extends BaseState<AppliedStaffPage, AppliedStaffControl
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/job/applied_staff_detail/applied_staff_detail_page.dart

@@ -51,7 +51,7 @@ class _AppliedStaffDetailState extends BaseState<AppliedStaffDetailPage, Applied
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/job/applied_staff_reviews/applied_staff_reviews_page.dart

@@ -60,7 +60,7 @@ class _AppliedStaffReviewsState extends BaseState<AppliedStaffReviewsPage, Appli
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/job/job_applied/job_applied_page.dart

@@ -69,7 +69,7 @@ class _JobAppliedState extends BaseState<JobAppliedPage, JobAppliedController> {
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/job/job_list/job_list_page.dart

@@ -70,7 +70,7 @@ class _JobListState extends BaseState<JobListPage, JobListController> {
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/job/job_list_edit/job_list_edit_page.dart

@@ -57,7 +57,7 @@ class JobListEditPage extends BaseStatelessPage<JobListEditController> {
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, state.isEditType ? "Edit".tr : "Detail".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/job/revise_add_edit/revise_add_edit_page.dart

@@ -68,7 +68,7 @@ class _LabourRequestAddState extends BaseState<ReviseAddEditPage, ReviseAddEditC
                     ? "Edit Revise".tr
                     : "Detail".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/job/revise_applied/revise_applied_page.dart

@@ -52,7 +52,7 @@ class _JobListState extends BaseState<ReviseAppliedPage, ReviseAppliedController
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/job/revise_list/revise_list_page.dart

@@ -51,7 +51,7 @@ class _JobListState extends BaseState<ReviseListPage, ReviseListController> {
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/job/revise_log/revise_log_page.dart

@@ -51,7 +51,7 @@ class _AppliedWorkflowState extends BaseState<ReviseLogPage, ReviseLogController
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/labour/job_template_add/job_template_add_page.dart

@@ -60,7 +60,7 @@ class JobTemplateAddPage extends BaseStatelessPage<JobTemplateAddController> {
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, Utils.isEmpty(state.templateId) ? "Create Template".tr : "Edit Template".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/labour/job_template_list/job_template_list_page.dart

@@ -50,7 +50,7 @@ class _JobTemplateListState extends BaseState<JobTemplateListPage, JobTemplateLi
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/labour/job_title_list/job_title_list_page.dart

@@ -51,7 +51,7 @@ class _JobTitleListState extends BaseState<JobTitleListPage, JobTitleListControl
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/labour/labour_request_add/labour_request_add_page.dart

@@ -54,7 +54,7 @@ class LabourRequestAddPage extends BaseStatelessPage<LabourRequestAddController>
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Add Labour Requisition".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/labour/labour_request_edit/labour_request_edit_page.dart

@@ -56,7 +56,7 @@ class LabourRequestEditPage extends BaseStatelessPage<LabourRequestEditControlle
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, state.pageType == 1 || state.pageType == 3 ? "Edit Labour Requisition".tr : "Labour Requisition".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/labour/labour_request_list/labour_request_list_page.dart

@@ -51,7 +51,7 @@ class _LabourRequestListState extends BaseState<LabourRequestListPage, LabourReq
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/labour/labour_review_workflow/labour_request_workflow_page.dart

@@ -51,7 +51,7 @@ class _LabourReviewWorkflowState extends BaseState<SGLabourRequestWorkflowPage,
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/main/main_page.dart

@@ -98,7 +98,7 @@ class _MainPageState extends BaseState<SGMainPage, MainController> with StateLif
         child: autoCtlGetBuilder(builder: (controller) {
           return Scaffold(
             body: SafeArea(
-              bottom: true,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
               top: false,
               //真正的 Content 布局,使用PageView保存状态
               child: Container(

packages/cpt_sg/lib/modules/report/dashboard/dashboard_page.dart

@@ -47,7 +47,7 @@ class _DeviceListState extends BaseState<SGDashboardPage, DashboardController> {
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/report/device_list/device_list_page.dart

@@ -46,7 +46,7 @@ class _DeviceListState extends BaseState<DeviceListPage, DeviceListController> {
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/report/report_finance/report_finance_page.dart

@@ -45,7 +45,7 @@ class ReportFinancePage extends BaseStatelessPage<ReportFinanceController> {
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Finance Report".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/report/report_labour/report_labour_page.dart

@@ -44,7 +44,7 @@ class ReportLabourPage extends BaseStatelessPage<ReportLabourController> {
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "YY Casual Labour Report".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/report/report_list/report_list_page.dart

@@ -49,7 +49,7 @@ class _MainPageState extends BaseState<SGReportListPage, SGReportListController>
     //双击退出应用
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/report/report_staff_request/report_staff_request_page.dart

@@ -47,7 +47,7 @@ class ReportStaffRequestPage extends BaseStatelessPage<ReportStaffRequestControl
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Monthly Staff Request Report22".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/review/attendance_review_list/attendance_review_page.dart

@@ -56,7 +56,7 @@ class _LabourReviewState extends BaseState<SGAttendanceReviewPage, AttendanceRev
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/review/attendance_review_workflow/attendance_review_workflow_page.dart

@@ -51,7 +51,7 @@ class _LabourReviewWorkflowState extends BaseState<SGAttendanceReviewWorkflowPag
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_sg/lib/modules/review/labour_review_list/labour_review_page.dart

@@ -54,7 +54,7 @@ class _LabourReviewState extends BaseState<SGLabourReviewPage, LabourReviewContr
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_sg/lib/modules/review/labour_review_workflow/labour_review_workflow_page.dart

@@ -51,7 +51,7 @@ class _LabourReviewWorkflowState extends BaseState<SGLabourReviewWorkflowPage, L
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/attendance/device_list/device_list_page.dart

@@ -55,7 +55,7 @@ class _DeviceListState extends BaseState<UKDeviceListPage, DeviceListController>
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/attendance/e_attendance_list/e_attendance_list_page.dart

@@ -65,7 +65,7 @@ class _SignInSignOutPageState extends BaseState<UKEAttendanceListPage, EAttendan
     return autoCtlGetBuilder(
       builder: (controller) {
         return SafeArea(
-          bottom: false,
+          bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/attendance/security_registration/security_registration_page.dart

@@ -65,7 +65,7 @@ class _SignInSignOutPageState extends BaseState<UKSecurityRegistrationPage, Secu
     return autoCtlGetBuilder(
       builder: (controller) {
         return SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/job/job_applied/job_applied_page.dart

@@ -54,7 +54,7 @@ class _JobAppliedState extends BaseState<UKJobAppliedPage, JobAppliedController>
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/job/job_applied_edit/job_applied_edit_page.dart

@@ -62,7 +62,7 @@ class _JobAppliedEditState extends BaseState<UKJobAppliedEditPage, JobAppliedEdi
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Edit".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/job/job_applied_staff_detail/applied_staff_detail_page.dart

@@ -50,7 +50,7 @@ class _AppliedStaffDetailState extends BaseState<UKAppliedStaffDetailPage, Appli
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/job/job_applied_staff_reviews/applied_staff_reviews_page.dart

@@ -60,7 +60,7 @@ class _AppliedStaffReviewsState extends BaseState<UKAppliedStaffReviewsPage, App
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/job/job_applied_workflow/applied_workflow_page.dart

@@ -51,7 +51,7 @@ class _AppliedWorkflowState extends BaseState<UKAppliedWorkflowPage, AppliedWork
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/job/job_category/job_category_page.dart

@@ -46,7 +46,7 @@ class _LabourRequestListState extends BaseState<JobCategoryPage, JobCategoryCont
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/job/job_list/job_list_page.dart

@@ -51,7 +51,7 @@ class _JobListState extends BaseState<UKJobListPage, JobListController> {
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/job/job_list_detail/job_list_detail_page.dart

@@ -55,7 +55,7 @@ class _JobListDetailState extends BaseState<UKJobListDetailPage, JobListDetailCo
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Job Detail".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/job/labour_request_add/labour_request_add_page.dart

@@ -66,7 +66,7 @@ class _LabourRequestAddState extends BaseState<UKLabourRequestAddPage, LabourReq
                     ? "Edit Labour Requisition".tr
                     : "Labour Requisition".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/job/labour_request_list/labour_request_list_page.dart

@@ -51,7 +51,7 @@ class _LabourRequestListState extends BaseState<UKLabourRequestListPage, LabourR
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/job/labour_request_workflow/labour_request_workflow_page.dart

@@ -51,7 +51,7 @@ class _LabourRequestWorkflowState extends BaseState<UKLabourRequestWorkflowPage,
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/job/template_add/template_add_page.dart

@@ -66,7 +66,7 @@ class _LabourTemplateAddState extends BaseState<UKTemplateAddPage, TemplateAddCo
             extendBodyBehindAppBar: true,
             appBar: MyAppBar.appBar(context, Utils.isEmpty(state.templateId) ? "Create Template".tr : "Edit Template".tr),
             body: SafeArea(
-              bottom: true,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
               top: false,
               child: Container(
                 width: double.infinity,

packages/cpt_uk/lib/modules/job/template_list/template_list_page.dart

@@ -49,7 +49,7 @@ class _LabourTemplateListState extends BaseState<UKTemplateListPage, TemplateLis
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/main/main_page.dart

@@ -98,7 +98,7 @@ class _MainPageState extends BaseState<UKMainPage, MainController> with StateLif
         child: autoCtlGetBuilder(builder: (controller) {
           return Scaffold(
             body: SafeArea(
-              bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
               top: false,
               //真正的 Content 布局,使用PageView保存状态
               child: Container(

packages/cpt_uk/lib/modules/report/attendance_report/attendance_report_page.dart

@@ -54,7 +54,7 @@ class _LabourReviewState extends BaseState<UKAttendanceReportPage, AttendanceRep
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/report/casual_payout_report/casual_payout_report_page.dart

@@ -44,7 +44,7 @@ class UKCasualPayoutReportPage extends BaseStatelessPage<CasualPayoutReportContr
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "YY Casual Labour Report".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/report/casual_report/casual_report_page.dart

@@ -51,7 +51,7 @@ class _LabourReviewState extends BaseState<UKCasualReportPage, CasualReportContr
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/report/finance_report/report_finance_page.dart

@@ -48,7 +48,7 @@ class UKReportFinancePage extends BaseStatelessPage<ReportFinanceController> {
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Finance Report".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/report/labour_report/labour_report_page.dart

@@ -54,7 +54,7 @@ class _LabourReviewState extends BaseState<UKLabourReportPage, LabourReportContr
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/report/outlet_staff_report/outlet_staff_report_page.dart

@@ -47,7 +47,7 @@ class UKOutletStaffReportPage extends BaseStatelessPage<OutletStaffReportControl
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Monthly Staff Request Report".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/report/report_list/report_list_page.dart

@@ -49,7 +49,7 @@ class _MainPageState extends BaseState<UKReportListPage, ReportListController> {
     //双击退出应用
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/report/working_hours_report/working_hours_report_page.dart

@@ -54,7 +54,7 @@ class _LabourReviewState extends BaseState<UKWorkingHoursReportPage, WorkingHour
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/review/attendance_review_list/attendance_review_page.dart

@@ -53,7 +53,7 @@ class _LabourReviewState extends BaseState<UKAttendanceReviewPage, AttendanceRev
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/review/labour_review_edit/labour_review_edit_page.dart

@@ -61,7 +61,7 @@ class _LabourReviewEditState extends BaseState<UKLabourReviewEditPage, LabourRev
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, state.pageType == 1 ? "Edit Labour Requisition".tr : "Labour Requisition".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_uk/lib/modules/review/labour_review_list/labour_review_page.dart

@@ -54,7 +54,7 @@ class _LabourReviewState extends BaseState<UKLabourReviewPage, LabourReviewContr
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_uk/lib/modules/review/labour_review_workflow/labour_request_workflow_page.dart

@@ -51,7 +51,7 @@ class _LabourReviewWorkflowState extends BaseState<UKLabourReviewWorkflowPage, L
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/job/applied_staff_detail/applied_staff_detail_page.dart

@@ -50,7 +50,7 @@ class _AppliedStaffDetailState extends BaseState<AppliedStaffDetailPage, Applied
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/job/applied_staff_reviews/applied_staff_reviews_page.dart

@@ -60,7 +60,7 @@ class _AppliedStaffReviewsState extends BaseState<AppliedStaffReviewsPage, Appli
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_vn/lib/modules/job/applied_workflow/applied_workflow_page.dart

@@ -51,7 +51,7 @@ class _AppliedWorkflowState extends BaseState<AppliedWorkflowPage, AppliedWorkfl
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/job/attendance_review_list/attendance_review_page.dart

@@ -53,7 +53,7 @@ class _LabourReviewState extends BaseState<AttendanceReviewPage, AttendanceRevie
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_vn/lib/modules/job/job_applied/job_applied_page.dart

@@ -54,7 +54,7 @@ class _JobAppliedState extends BaseState<JobAppliedPage, JobAppliedController> {
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/job/job_applied_edit/job_applied_edit_page.dart

@@ -62,7 +62,7 @@ class _JobAppliedEditState extends BaseState<JobAppliedEditPage, JobAppliedEditC
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Edit".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/job/job_list/job_list_page.dart

@@ -51,7 +51,7 @@ class _JobListState extends BaseState<JobListPage, JobListController> {
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/job/job_list_detail/job_list_detail_page.dart

@@ -55,7 +55,7 @@ class _JobListDetailState extends BaseState<JobListDetailPage, JobListDetailCont
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "Job Detail".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/job/sign_in_sign_out/sign_in_sign_out_page.dart

@@ -92,7 +92,7 @@ class _SignInSignOutPageState extends BaseState<SignInSignOutPage, SignInSignOut
     return autoCtlGetBuilder(
       builder: (controller) {
         return SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/labour/labour_request_add/labour_request_add_page.dart

@@ -66,7 +66,7 @@ class _LabourRequestAddState extends BaseState<LabourRequestAddPage, LabourReque
                     ? "Edit Labour Requisition".tr
                     : "Labour Requisition".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/labour/labour_request_list/labour_request_list_page.dart

@@ -51,7 +51,7 @@ class _LabourRequestListState extends BaseState<LabourRequestListPage, LabourReq
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_vn/lib/modules/labour/labour_request_workflow/labour_request_workflow_page.dart

@@ -51,7 +51,7 @@ class _LabourRequestWorkflowState extends BaseState<LabourRequestWorkflowPage, L
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/labour/labour_review_edit/labour_review_edit_page.dart

@@ -61,7 +61,7 @@ class _LabourReviewEditState extends BaseState<LabourReviewEditPage, LabourRevie
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, state.pageType == 1 ? "Edit Labour Requisition".tr : "Labour Requisition".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/labour/labour_review_list/labour_review_page.dart

@@ -54,7 +54,7 @@ class _LabourReviewState extends BaseState<LabourReviewPage, LabourReviewControl
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_vn/lib/modules/labour/labour_review_workflow/labour_request_workflow_page.dart

@@ -51,7 +51,7 @@ class _LabourReviewWorkflowState extends BaseState<LabourReviewWorkflowPage, Lab
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return  SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/labour/labour_template_add/labour_template_add_page.dart

@@ -66,7 +66,7 @@ class _LabourTemplateAddState extends BaseState<LabourTemplateAddPage, LabourTem
             extendBodyBehindAppBar: true,
             appBar: MyAppBar.appBar(context, Utils.isEmpty(state.templateId) ? "Create Template".tr : "Edit Template".tr),
             body: SafeArea(
-              bottom: true,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
               top: false,
               child: Container(
                 width: double.infinity,

packages/cpt_vn/lib/modules/labour/labour_template_list/labour_template_list_page.dart

@@ -51,7 +51,7 @@ class _LabourTemplateListState extends BaseState<LabourTemplateListPage, LabourT
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_vn/lib/modules/main/main_page.dart

@@ -98,7 +98,7 @@ class _MainPageState extends BaseState<VNMainPage, MainController> with StateLif
         child: autoCtlGetBuilder(builder: (controller) {
           return Scaffold(
             body: SafeArea(
-              bottom: true,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
               top: false,
               //真正的 Content 布局,使用PageView保存状态
               child: Container(

packages/cpt_vn/lib/modules/report/device_list/device_list_page.dart

@@ -46,7 +46,7 @@ class _DeviceListState extends BaseState<DeviceListPage, DeviceListController> {
   Widget build(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,

packages/cpt_vn/lib/modules/report/report_finance/report_finance_page.dart

@@ -42,145 +42,145 @@ class ReportFinancePage extends BaseStatelessPage<ReportFinanceController> {
   Widget buildWidget(BuildContext context) {
     return autoCtlGetBuilder(builder: (controller) {
       return Scaffold(
-        extendBodyBehindAppBar: true,
-        appBar: MyAppBar.appBar(context, "Finance Report".tr),
-        body: SafeArea(
-          bottom: false,
-          top: false,
-          child: Container(
-            width: double.infinity,
-            height: double.infinity,
-            padding: EdgeInsets.only(top: kToolbarHeight + ScreenUtil.getStatusBarH(context) + 1),
-            decoration: const BoxDecoration(
-              gradient: LinearGradient(
-                colors: [
-                  Color(0xFF091D44),
-                  Color(0xFF245A8A),
-                  Color(0xFF7F7CEC),
-                ],
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
-              ),
-            ),
-            child: Column(
-              children: [
-                // 时间筛选
-                Container(
-                    width: double.infinity,
-                    height: 36,
-                    margin: const EdgeInsets.symmetric(vertical: 10, horizontal: 15),
-                    decoration: BoxDecoration(
-                      color: const Color(0xFF4DCFF6).withOpacity(0.2), // 设置背景颜色和不透明度
-                      borderRadius: BorderRadius.circular(20.0), // 设置圆角
-                    ),
-                    child: Row(
-                      children: [
-                        MyTextView(
-                          DateTimeUtils.formatDate(state.startDateTime, format: "yyyy-MM-dd"),
-                          hint: "Start Date".tr,
-                          textHintColor: ColorConstants.textGrayAECAE5,
-                          fontSize: 15,
-                          textAlign: TextAlign.center,
-                          isFontRegular: true,
-                          onClick: controller.pickerStartDate,
-                          textColor: ColorConstants.textGrayAECAE5,
-                        ).expanded(),
-                        Container(color: ColorConstants.dividerBar, height: 21.5, width: 0.5),
-                        MyTextView(
-                          DateTimeUtils.formatDate(state.endDateTime, format: "yyyy-MM-dd"),
-                          hint: "End Date".tr,
-                          textHintColor: ColorConstants.textGrayAECAE5,
-                          fontSize: 15,
-                          textAlign: TextAlign.center,
-                          isFontRegular: true,
-                          onClick: controller.pickerEndDate,
-                          textColor: ColorConstants.textGrayAECAE5,
-                        ).expanded(),
-                      ],
-                    )),
+          extendBodyBehindAppBar: true,
+          appBar: MyAppBar.appBar(context, "Finance Report".tr),
+          body: SafeArea(
+              bottom: MediaQuery.of(context).padding.bottom > 38,
+              top: false,
+              child: Container(
+              width: double.infinity,
+          height: double.infinity,
+              padding: EdgeInsets.only(top: kToolbarHeight + ScreenUtil.getStatusBarH(context) + 1),
+      decoration: const BoxDecoration(
+      gradient: LinearGradient(
+      colors: [
+      Color(0xFF091D44),
+      Color(0xFF245A8A),
+      Color(0xFF7F7CEC),
+      ],
+      begin: Alignment.topCenter,
+      end: Alignment.bottomCenter,
+      ),
+      ),
+      child: Column(
+      children: [
+      // 时间筛选
+      Container(
+      width: double.infinity,
+      height: 36,
+      margin: const EdgeInsets.symmetric(vertical: 10, horizontal: 15),
+      decoration: BoxDecoration(
+      color: const Color(0xFF4DCFF6).withOpacity(0.2), // 设置背景颜色和不透明度
+      borderRadius: BorderRadius.circular(20.0), // 设置圆角
+      ),
+      child: Row(
+      children: [
+      MyTextView(
+      DateTimeUtils.formatDate(state.startDateTime, format: "yyyy-MM-dd"),
+      hint: "Start Date".tr,
+      textHintColor: ColorConstants.textGrayAECAE5,
+      fontSize: 15,
+      textAlign: TextAlign.center,
+      isFontRegular: true,
+      onClick: controller.pickerStartDate,
+      textColor: ColorConstants.textGrayAECAE5,
+      ).expanded(),
+      Container(color: ColorConstants.dividerBar, height: 21.5, width: 0.5),
+      MyTextView(
+      DateTimeUtils.formatDate(state.endDateTime, format: "yyyy-MM-dd"),
+      hint: "End Date".tr,
+      textHintColor: ColorConstants.textGrayAECAE5,
+      fontSize: 15,
+      textAlign: TextAlign.center,
+      isFontRegular: true,
+      onClick: controller.pickerEndDate,
+      textColor: ColorConstants.textGrayAECAE5,
+      ).expanded(),
+      ],
+      )),
 
-                //总数据
-                Container(
-                    margin: const EdgeInsets.only(left: 15, right: 15),
-                    width: double.infinity,
-                    height: 45,
-                    decoration: BoxDecoration(
-                      color: const Color(0xFF4DCFF6).withOpacity(0.2), // 设置背景颜色和不透明度
-                      borderRadius: BorderRadius.circular(5), // 设置圆角
-                    ),
-                    child: Row(
-                      children: [
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            MyTextView(
-                              "Total RQST:",
-                              fontSize: 14,
-                              isFontRegular: true,
-                              onClick: controller.pickerStartDate,
-                              textColor: ColorConstants.textGrayAECAE5,
-                            ),
-                            MyTextView(
-                              state.entity?.requestTotal.toString() ?? "",
-                              fontSize: 14,
-                              marginLeft: 5,
-                              isFontRegular: true,
-                              textColor: ColorConstants.white,
-                            ),
-                          ],
-                        ).expanded(),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            MyTextView(
-                              "Total Actual:",
-                              fontSize: 14,
-                              isFontRegular: true,
-                              onClick: controller.pickerStartDate,
-                              textColor: ColorConstants.textGrayAECAE5,
-                            ),
-                            MyTextView(
-                              state.entity?.actualTotal.toString() ?? "",
-                              fontSize: 14,
-                              marginLeft: 5,
-                              isFontRegular: true,
-                              textColor: ColorConstants.white,
-                            ),
-                          ],
-                        ).expanded(),
-                      ],
-                    )),
+      //总数据
+      Container(
+      margin: const EdgeInsets.only(left: 15, right: 15),
+      width: double.infinity,
+      height: 45,
+      decoration: BoxDecoration(
+      color: const Color(0xFF4DCFF6).withOpacity(0.2), // 设置背景颜色和不透明度
+      borderRadius: BorderRadius.circular(5), // 设置圆角
+      ),
+      child: Row(
+      children: [
+      Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+      MyTextView(
+      "Total RQST:",
+      fontSize: 14,
+      isFontRegular: true,
+      onClick: controller.pickerStartDate,
+      textColor: ColorConstants.textGrayAECAE5,
+      ),
+      MyTextView(
+      state.entity?.requestTotal.toString() ?? "",
+      fontSize: 14,
+      marginLeft: 5,
+      isFontRegular: true,
+      textColor: ColorConstants.white,
+      ),
+      ],
+      ).expanded(),
+      Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+      MyTextView(
+      "Total Actual:",
+      fontSize: 14,
+      isFontRegular: true,
+      onClick: controller.pickerStartDate,
+      textColor: ColorConstants.textGrayAECAE5,
+      ),
+      MyTextView(
+      state.entity?.actualTotal.toString() ?? "",
+      fontSize: 14,
+      marginLeft: 5,
+      isFontRegular: true,
+      textColor: ColorConstants.white,
+      ),
+      ],
+      ).expanded(),
+      ],
+      )),
 
-                //动态列表
-                LoadStateLayout(
-                  state: controller.loadingState,
-                  errorMessage: controller.errorMessage,
-                  errorRetry: () {
-                    controller.retryRequest();
-                  },
-                  successSliverWidget: [
-                    SliverGrid(
-                      delegate: SliverChildBuilderDelegate(
-                        (context, index) {
-                          return ReportFinanceItem(item: state.datas[index]);
-                        },
-                        childCount: state.datas.length,
-                      ),
-                      gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                        crossAxisCount: 2, // 每行2个项目
-                        mainAxisSpacing: 8.5, // 主轴方向的间距
-                        crossAxisSpacing: 9.5, // 交叉轴方向的间距
-                        childAspectRatio: 168.16 / 107.22, // 子项目的宽高比
-                      ),
-                    )
-                  ],
-                ).marginOnly(left: 15, right: 15, top: 10).expanded(),
-              ],
-            ),
-          ),
-        ),
+      //动态列表
+      LoadStateLayout(
+      state: controller.loadingState,
+      errorMessage: controller.errorMessage,
+      errorRetry: () {
+      controller.retryRequest();
+      },
+      successSliverWidget: [
+      SliverGrid(
+      delegate: SliverChildBuilderDelegate(
+      (context, index) {
+      return ReportFinanceItem(item: state.datas[index]);
+      },
+      childCount: state.datas.length,
+      ),
+      gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+      crossAxisCount: 2, // 每行2个项目
+      mainAxisSpacing: 8.5, // 主轴方向的间距
+      crossAxisSpacing: 9.5, // 交叉轴方向的间距
+      childAspectRatio: 168.16 / 107.22, // 子项目的宽高比
+      ),
+      )
+      ],
+      ).marginOnly(left: 15, right: 15, top: 10).expanded(),
+      ],
+      ),
+      ),
+      ),
       );
     });
   }

packages/cpt_vn/lib/modules/report/report_labour_vn/report_labour_vn_page.dart

@@ -47,7 +47,7 @@ class ReportLabourVNPage extends BaseStatelessPage<ReportLabourVNController> {
         extendBodyBehindAppBar: true,
         appBar: MyAppBar.appBar(context, "YY Casual Labour Report".tr),
         body: SafeArea(
-          bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
           top: false,
           child: Container(
             width: double.infinity,

packages/cpt_vn/lib/modules/report/report_list/report_list_page.dart

@@ -49,7 +49,7 @@ class _MainPageState extends BaseState<ReportListPage, ReportListController> {
     //双击退出应用
     return autoCtlGetBuilder(builder: (controller) {
       return SafeArea(
-        bottom: false,
+        bottom: MediaQuery.of(context).padding.bottom > 38,
         top: false,
         child: Container(
           width: double.infinity,