Me页面，设置页面，设施页面，表单模块相关调整

packages/cpt_facility/lib/modules/book_confirm/book_confirm_page.dart

@@ -12,6 +12,7 @@ import 'package:widgets/my_appbar.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import '../../router/page/facility_page_router.dart';
 import '../booking/facility_booking_view_model.dart';
 
@@ -185,6 +186,7 @@ class BookConfirmPage extends HookConsumerWidget {
                   iconPath,
                   width: iconWidth,
                   height: iconHeight,
+                  color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                 ).marginOnly(right: 15),
                 Column(
                   mainAxisSize: MainAxisSize.min,

packages/cpt_facility/lib/modules/booking/facility_booking_page.dart

@@ -20,6 +20,7 @@ import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/shatter/select_calendar/calendar_bottom_sheet.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../router/page/facility_page_router.dart';
@@ -65,10 +66,11 @@ class FacilityBookingPage extends HookConsumerWidget {
           //去设施小区的定位图片
           Visibility(
             visible: facilityEntity.mapResources.isNotEmpty,
-            child: const MyAssetImage(
+            child: MyAssetImage(
               Assets.facilityTitleLocationIcon,
               width: 44,
               height: 44,
+              color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
             ).marginOnly(right: 3).onTap(() {
               FacilityLocationPage.startInstance(context: context, imageUrls: facilityEntity.mapResources);
             }),
@@ -93,7 +95,12 @@ class FacilityBookingPage extends HookConsumerWidget {
                 marginLeft: 15,
                 isFontMedium: true,
               ).expanded(),
-              const MyAssetImage(Assets.facilityConfirmDateIcon, width: 22.5, height: 22.5).marginOnly(right: 10).onTap(() {
+              MyAssetImage(
+                Assets.facilityConfirmDateIcon,
+                width: 22.5,
+                height: 22.5,
+                color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+              ).marginOnly(right: 10).onTap(() {
                 //日历日期选择器
                 _datePickerBottomSheet(context, ref);
               }, padding: 5),

packages/cpt_facility/lib/modules/detail/facility_detail_page.dart

@@ -10,6 +10,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/utils/dark_theme_util.dart';
 import '../../router/page/facility_page_router.dart';
 import 'facility_detail_view_model.dart';
 
@@ -134,10 +135,11 @@ class FacilityDetailPage extends HookConsumerWidget {
       child: Column(
         children: [
           //成功图片
-          const MyAssetImage(
+          MyAssetImage(
             Assets.facilityPaymentSuccessIcon,
             width: 54,
             height: 54,
+            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
           ).marginOnly(top: 11, bottom: 13),
 
           //支付成功
@@ -328,6 +330,7 @@ class FacilityDetailPage extends HookConsumerWidget {
                   iconPath,
                   width: iconWidth,
                   height: iconHeight,
+                  color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                 ).marginOnly(right: 15),
                 Column(
                   mainAxisSize: MainAxisSize.min,

packages/cpt_facility/lib/modules/facility/facility_page.dart

@@ -10,6 +10,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/utils/dark_theme_util.dart';
 
 import '../../router/page/facility_page_router.dart';
 import 'facility_view_model.dart';
@@ -38,12 +39,13 @@ class FacilityPage extends HookConsumerWidget {
         backgroundColor: context.appColors.backgroundWhite,
         actions: [
           //去设施小区的定位图片
-          const MyAssetImage(
+          MyAssetImage(
             Assets.facilityQuestionIcon,
             width: 44,
             height: 44,
+            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
           ).marginOnly(right: 3).onTap(() {
-           ToastEngine.show("Question");
+            ToastEngine.show("Question");
           }),
         ],
       ),

packages/cpt_form/lib/modules/form/apply/item_form_apply.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 ///  设施的Active的Item
 class FormApplyItem extends StatelessWidget {
@@ -34,10 +35,10 @@ class FormApplyItem extends StatelessWidget {
         children: [
           MyAssetImage(
             FormTypes.iconMap[item.typeId]?['icon_path'],
-              width: FormTypes.iconMap[item.typeId]?['width'],
-              height: FormTypes.iconMap[item.typeId]?['height'],
+            width: FormTypes.iconMap[item.typeId]?['width'],
+            height: FormTypes.iconMap[item.typeId]?['height'],
+            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
           ),
-
           MyTextView(
             FormTypes.iconMap[item.typeId]?['name'],
             marginLeft: 17,

packages/cpt_form/lib/modules/form/approve/item_form_approve.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import '../form_types.dart';
 
@@ -38,6 +39,7 @@ class FormApproveItem extends StatelessWidget {
                 FormTypes.iconMap[item.estateOnlineForm?.type?.id]?['icon_path'],
                 width: FormTypes.iconMap[item.estateOnlineForm?.type?.id]?['width'],
                 height: FormTypes.iconMap[item.estateOnlineForm?.type?.id]?['height'],
+                color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
               ),
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,

packages/cpt_form/lib/modules/form/not_approve/item_form_not_approve.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import '../form_types.dart';
 
@@ -39,6 +40,7 @@ class FormNotApproveItem extends StatelessWidget {
                 FormTypes.iconMap[item.estateOnlineForm?.type?.id]?['icon_path'],
                 width: FormTypes.iconMap[item.estateOnlineForm?.type?.id]?['width'],
                 height: FormTypes.iconMap[item.estateOnlineForm?.type?.id]?['height'],
+                color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
               ),
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,

packages/cpt_form/lib/modules/form/submit/item_form_submit.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import '../form_types.dart';
 
@@ -38,6 +39,7 @@ class FormSubmitItem extends StatelessWidget {
                 FormTypes.iconMap[item.estateOnlineForm?.type?.id]?['icon_path'],
                 width: FormTypes.iconMap[item.estateOnlineForm?.type?.id]?['width'],
                 height: FormTypes.iconMap[item.estateOnlineForm?.type?.id]?['height'],
+                color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
               ),
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,

packages/cpt_payment/lib/modules/add_card/add_card_page.dart

@@ -12,6 +12,7 @@ import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_text_field.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../router/page/payment_page_router.dart';
@@ -213,7 +214,14 @@ class AddCardPage extends HookConsumerWidget {
         obscureText: obscureText,
         errorText: errorText,
         showLeftIcon: showLeftIcon,
-        leftWidget: showLeftIcon ? MyAssetImage(leftIcon ?? "", width: 27, height: 27) : const SizedBox(),
+        leftWidget: showLeftIcon
+            ? MyAssetImage(
+                leftIcon ?? "",
+                width: 27,
+                height: 27,
+                color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+              )
+            : const SizedBox(),
         showRightIcon: showRightIcon,
         rightWidget: rightWidget,
       ),

packages/cpt_payment/lib/modules/payment/payment/item_payment_list.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import 'payment_list_types.dart';
 
@@ -44,6 +45,7 @@ class PaymentListItem extends StatelessWidget {
             PaymentListTypes.iconMap[item.type]?['icon_path'],
             width: PaymentListTypes.iconMap[item.type]?['width'],
             height: PaymentListTypes.iconMap[item.type]?['height'],
+            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary,darkColor: Colors.white),
           ),
 
           MyTextView(

packages/cpt_payment/lib/modules/payment_confirm/payment_confirm_page.dart

@@ -10,6 +10,7 @@ import 'package:widgets/my_appbar.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import '../../router/page/payment_page_router.dart';
 import 'payment_confirm_view_model.dart';
@@ -48,7 +49,12 @@ class PaymentConfirmPage extends HookConsumerWidget {
                 //金额
                 Row(
                   children: [
-                    const MyAssetImage(Assets.paymentInfoDetails, width: 27, height: 27),
+                    MyAssetImage(
+                      Assets.paymentInfoDetails,
+                      width: 27,
+                      height: 27,
+                      color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+                    ),
                     MyTextView(
                       S.current.payment_details,
                       textColor: context.appColors.textBlack,
@@ -86,7 +92,12 @@ class PaymentConfirmPage extends HookConsumerWidget {
                 // DESC
                 Row(
                   children: [
-                    const MyAssetImage(Assets.paymentInfoNotes, width: 27, height: 27),
+                    MyAssetImage(
+                      Assets.paymentInfoNotes,
+                      width: 27,
+                      height: 27,
+                      color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+                    ),
                     MyTextView(
                       S.current.notes_to_recipient,
                       textColor: context.appColors.textBlack,
@@ -108,7 +119,7 @@ class PaymentConfirmPage extends HookConsumerWidget {
                   isFontRegular: true,
                 ),
 
-                _paymentInfo(context,ref),
+                _paymentInfo(context, ref),
               ],
             ),
           ).expanded(),
@@ -131,7 +142,7 @@ class PaymentConfirmPage extends HookConsumerWidget {
   }
 
   //底部的支付信息
-  Widget _paymentInfo(BuildContext context,WidgetRef ref) {
+  Widget _paymentInfo(BuildContext context, WidgetRef ref) {
     final viewModel = ref.watch(paymentConfirmViewModelProvider.notifier);
 
     return Container(

packages/cpt_payment/lib/modules/payment_info/payment_info_page.dart

@@ -11,6 +11,7 @@ import 'package:widgets/my_appbar.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import '../../router/page/payment_page_router.dart';
 import 'payment_info_view_model.dart';
@@ -50,9 +51,14 @@ class PaymentInfoPage extends HookConsumerWidget {
                       //金额
                       Row(
                         children: [
-                          const MyAssetImage(Assets.paymentInfoDetails, width: 27, height: 27),
+                          MyAssetImage(
+                            Assets.paymentInfoDetails,
+                            width: 27,
+                            height: 27,
+                            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+                          ),
                           MyTextView(
-                             S.current.payment_details,
+                            S.current.payment_details,
                             textColor: context.appColors.textBlack,
                             fontSize: 17,
                             marginLeft: 14,
@@ -81,14 +87,19 @@ class PaymentInfoPage extends HookConsumerWidget {
 
                       Container(
                         height: 0.5,
-                        margin: const EdgeInsets.only(top: 22,bottom: 13.5),
+                        margin: const EdgeInsets.only(top: 22, bottom: 13.5),
                         color: context.appColors.dividerDefault,
                       ),
 
                       // DESC
                       Row(
                         children: [
-                          const MyAssetImage(Assets.paymentInfoNotes, width: 27, height: 27),
+                          MyAssetImage(
+                            Assets.paymentInfoNotes,
+                            width: 27,
+                            height: 27,
+                            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+                          ),
                           MyTextView(
                             S.current.notes_to_recipient,
                             textColor: context.appColors.textBlack,

packages/cpt_payment/lib/modules/payment_success/payment_success_page.dart

@@ -9,6 +9,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/utils/dark_theme_util.dart';
 
 import '../../router/page/payment_page_router.dart';
 import 'payment_success_view_model.dart';
@@ -17,7 +18,6 @@ import 'payment_success_view_model.dart';
 class PaymentSuccessPage extends HookConsumerWidget {
   const PaymentSuccessPage({Key? key}) : super(key: key);
 
-
   //启动并关闭其他栈
   static void startWithPop() {
     appRouter.pushAndPopUntil(
@@ -40,10 +40,11 @@ class PaymentSuccessPage extends HookConsumerWidget {
         child: Column(
           children: [
             //成功图片
-            const MyAssetImage(
+            MyAssetImage(
               Assets.facilityPaymentSuccessIcon,
               width: 54,
               height: 54,
+              color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
             ).marginOnly(top: 11, bottom: 13),
 
             //支付成功

packages/cpt_profile/lib/modules/my_estate/item_estate.dart

@@ -77,16 +77,20 @@ class EstateItem extends StatelessWidget {
                 height: 0.5,
                 color: context.appColors.backgroundDark,
               ),
-              Center(
-                child: MyTextView(
-                  S.current.remove,
-                  paddingTop: 16,
-                  paddingBottom: 16,
-                  fontSize: 16,
-                  onClick: deleteAction,
-                  isFontMedium: true,
-                  textColor: context.appColors.textPrimary,
-                ),
+              Row(
+                children: [
+                  MyTextView(
+                    S.current.remove,
+                    paddingTop: 16,
+                    paddingBottom: 16,
+                    fontSize: 16,
+                    textAlign: TextAlign.center,
+                    onClick: deleteAction,
+                    isFontMedium: true,
+                    textColor: context.appColors.textPrimary,
+                  ).expanded(),
+                ],
+
               )
             ],
           ),
@@ -102,7 +106,6 @@ class EstateItem extends StatelessWidget {
         MyTextView(
           S.current.approved,
           fontSize: 16,
-          onClick: deleteAction,
           isFontMedium: true,
           textColor: context.appColors.textGreen,
         ).marginOnly(top: childIndex == 0 ? 46.5 : 56.5, right: 15).alignRight()

packages/cpt_profile/lib/modules/my_estate/my_estate_view_model.dart

@@ -97,7 +97,7 @@ class MyEstateViewModel extends _$MyEstateViewModel with DioCancelableMixin {
   void showRemoveEstateDialog(String? unitId) {
     DialogEngine.show(widget: RemoveAccountDialog(
       confirmAction: () {
-        _doDeleteEstateUnit(unitId);
+        // _doDeleteEstateUnit(unitId);
       },
     ));
   }

packages/cs_plugin_platform/lib/engine/permission/permission_engine.dart

@@ -194,7 +194,7 @@ class PermissionEngine {
       // 判断响应结果
       if (firstCompleted == 'delay') {
         // 如果是延迟Future完成了，表示500毫秒内没有获得权限响应，显示对话框
-        _showPermissionDialog("“YYHome” want to access your location permission to obtain your location and recommend nearby information");
+        _showPermissionDialog("“24iFM” want to access your location permission to obtain your location and recommend nearby information");
         // 再次等待权限请求结果
         status = await permissionRequestFuture;
         DialogEngine.dismiss(tag: "permission");
@@ -243,7 +243,7 @@ class PermissionEngine {
       // 判断响应结果
       if (firstCompleted == 'delay') {
         // 如果是延迟Future完成了，表示500毫秒内没有获得权限响应，显示对话框
-        _showPermissionDialog("“YYHome”requires permission to make phone calls for communication. Please allow access to this permission");
+        _showPermissionDialog("“24iFM”requires permission to make phone calls for communication. Please allow access to this permission");
         // 再次等待权限请求结果
         status = await permissionRequestFuture;
         DialogEngine.dismiss(tag: "permission");

packages/cs_resources/lib/theme/app_colors_theme.dart

@@ -19,7 +19,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
   static const _colorD7DBE7 = Color(0xffD7DBE7);
   static const _colorBDBDBD = Color(0xFFBDBDBD);
   static const _colorF2F2F2 = Color(0xFFF2F2F2);
-  static const _colorFE6C00 = Color(0xFFFE6C00);
+  static const _colorFE6C00 = Color(0xFFFEA700);
   static const _colorD3D3D3 = Color(0xFFD3D3D3);
   static const _color333333 = Color(0xFF333333);
   static const _colorF3F3F3 = Color(0xFFF3F3F3);

packages/cs_widgets/lib/shatter/select_calendar/full_calendar.dart

@@ -1,10 +1,13 @@
 import 'package:cs_resources/generated/assets.dart';
+import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 
+import '../../utils/dark_theme_util.dart';
+
 //日历的具体展示
 class FullCalendar extends StatefulWidget {
   final DateTime startDate;
@@ -146,20 +149,22 @@ class _FullCalendarState extends State<FullCalendar> {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.baseLibCalendarLeftIcon,
                     width: 44,
                     height: 44,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).onTap(() {
                     _horizontalScroll.nextPage(
                       duration: const Duration(milliseconds: 300),
                       curve: Curves.ease,
                     );
                   }),
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.baseLibCalendarRightIcon,
                     width: 44,
                     height: 44,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).onTap(() {
                     _horizontalScroll.previousPage(
                       duration: const Duration(milliseconds: 300),