From 6bf0234af1bac943ac2726065810a3128f3c3467 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Mon, 17 Jan 2022 09:37:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=8F=98=E9=87=8F=20=E6=9B=BF=E6=8D=A2=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../announcement/anouncement_details.dart | 12 +++--- lib/ui/home/business/todo_outdoor_card.dart | 18 +++++---- lib/ui/home/personal_draw.dart | 3 +- .../rules_manage/rules_manage_page.dart | 27 ++++++++------ .../items_outdoor/items_outdoor_card.dart | 20 +++++----- .../items_outdoor_details_page.dart | 37 ++++++++++--------- .../tool_pages/warning/warning_sub_page.dart | 17 ++++----- .../tool_pages/warning/warning_success.dart | 15 ++++---- 8 files changed, 79 insertions(+), 70 deletions(-) diff --git a/lib/ui/home/announcement/anouncement_details.dart b/lib/ui/home/announcement/anouncement_details.dart index 9125176..7389fe1 100644 --- a/lib/ui/home/announcement/anouncement_details.dart +++ b/lib/ui/home/announcement/anouncement_details.dart @@ -1,13 +1,12 @@ // Flutter imports: -import 'package:flutter/material.dart'; - -// Package imports: -import 'package:flutter_screenutil/flutter_screenutil.dart'; - // Project imports: import 'package:aku_new_community_manager/models/announce/announcement_detail_model.dart'; import 'package:aku_new_community_manager/style/app_style.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; class AnouncementDetails extends StatelessWidget { final AnnouncementDetailModel model; @@ -48,7 +47,8 @@ class AnouncementDetails extends StatelessWidget { Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Text('南宁人才公寓物业管理处', style: AppStyle().primaryStyle), + Text('${S.of(context)!.tempPlotName}物业管理处', + style: AppStyle().primaryStyle), SizedBox( height: 4.w, ), diff --git a/lib/ui/home/business/todo_outdoor_card.dart b/lib/ui/home/business/todo_outdoor_card.dart index 435f397..ff2bce1 100644 --- a/lib/ui/home/business/todo_outdoor_card.dart +++ b/lib/ui/home/business/todo_outdoor_card.dart @@ -1,23 +1,25 @@ // Flutter imports: +// Project imports: +import 'package:aku_new_community_manager/models/todo_bussiness/todo_outdoor_model.dart'; +import 'package:aku_new_community_manager/style/app_style.dart'; +import 'package:aku_new_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; - +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; // Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; -// Project imports: -import 'package:aku_new_community_manager/models/todo_bussiness/todo_outdoor_model.dart'; -import 'package:aku_new_community_manager/style/app_style.dart'; -import 'package:aku_new_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart'; - class ToDoOutDoorCard extends StatefulWidget { final ToDoOutDoorModel model; final VoidCallback? callRefresh; final bool homeDisplay; ToDoOutDoorCard( - {Key? key, required this.model, this.callRefresh, this.homeDisplay = false}) + {Key? key, + required this.model, + this.callRefresh, + this.homeDisplay = false}) : super(key: key); @override @@ -102,7 +104,7 @@ class _ToDoOutDoorCardState extends State { ), Spacer(), Text( - '五象新区人才公寓', + '${S.of(context)!.tempPlotName}', style: AppStyle().primaryStyle, ), ], diff --git a/lib/ui/home/personal_draw.dart b/lib/ui/home/personal_draw.dart index 6701eb8..e44cf44 100644 --- a/lib/ui/home/personal_draw.dart +++ b/lib/ui/home/personal_draw.dart @@ -9,6 +9,7 @@ import 'package:aku_new_community_manager/ui/settings/user_info_page.dart'; import 'package:aku_new_community_manager/ui/widgets/app_widgets/aku_avatar.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; @@ -101,7 +102,7 @@ class _PersonalDrawState extends State { children: [ Icon(Icons.location_on_outlined, size: 33.w), Text( - '人才公寓', + '${S.of(context)!.tempPlotName}', style: TextStyle( color: AppStyle.primaryTextColor, fontSize: 24.sp), diff --git a/lib/ui/manage_pages/rules_manage/rules_manage_page.dart b/lib/ui/manage_pages/rules_manage/rules_manage_page.dart index 8f32ca2..5f4d4e8 100644 --- a/lib/ui/manage_pages/rules_manage/rules_manage_page.dart +++ b/lib/ui/manage_pages/rules_manage/rules_manage_page.dart @@ -1,21 +1,20 @@ // Flutter imports: +// Project imports: +import 'package:aku_new_community_manager/const/api.dart'; +import 'package:aku_new_community_manager/models/manager/rules_manage/rules_manage_list_model.dart'; +import 'package:aku_new_community_manager/style/app_style.dart'; import 'package:aku_new_community_manager/ui/manage_pages/rules_manage/rules_manage_detail_page.dart'; -import 'package:flutter/material.dart'; - +import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_new_community_manager/ui/widgets/common/bee_list_view.dart'; // Package imports: import 'package:common_utils/common_utils.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; -// Project imports: -import 'package:aku_new_community_manager/const/api.dart'; -import 'package:aku_new_community_manager/models/manager/rules_manage/rules_manage_list_model.dart'; -import 'package:aku_new_community_manager/style/app_style.dart'; -import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_new_community_manager/ui/widgets/common/bee_list_view.dart'; - class RulesManagePage extends StatefulWidget { RulesManagePage({Key? key}) : super(key: key); @@ -66,7 +65,9 @@ class _RulesManagePageState extends State { Widget _buildCard(RulesManageListModel model) { return GestureDetector( onTap: () { - Get.to(() => RulesManageDetailPage(model: model,)); + Get.to(() => RulesManageDetailPage( + model: model, + )); }, child: Container( color: Colors.white, @@ -92,7 +93,11 @@ class _RulesManagePageState extends State { 32.w.heightBox, Row( children: [ - '南宁人才公寓'.text.size(20.sp).color(kTextSubColor).make(), + '${S.of(context)!.tempPlotName}' + .text + .size(20.sp) + .color(kTextSubColor) + .make(), Spacer(), '发布于 ${DateUtil.formatDateStr(model.releaseDate!, format: 'MM-dd HH:mm')}' .text diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart index 15178a9..027449d 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart @@ -1,22 +1,24 @@ // Flutter imports: -import 'package:aku_new_community_manager/ui/widgets/common/aku_button.dart'; -import 'package:flutter/material.dart'; - -// Package imports: -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; - // Project imports: import 'package:aku_new_community_manager/const/resource.dart'; import 'package:aku_new_community_manager/models/manager/goods_out/goods_out_item_model.dart'; import 'package:aku_new_community_manager/style/app_style.dart'; import 'package:aku_new_community_manager/tools/widget_tool.dart'; import 'package:aku_new_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart'; +import 'package:aku_new_community_manager/ui/widgets/common/aku_button.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; class ItemsOutdoorCard extends StatefulWidget { final GoodsOutItemModel model; final VoidCallback? callRefresh; - ItemsOutdoorCard({Key? key, /*required*/ /*required*/ required this.model, this.callRefresh}) + ItemsOutdoorCard( + {Key? key, + /*required*/ /*required*/ required this.model, + this.callRefresh}) : super(key: key); @override @@ -97,7 +99,7 @@ class _ItemsOutdoorCardState extends State { ), Spacer(), Text( - '五象新区人才公寓', + '${S.of(context)!.tempPlotName}', style: AppStyle().primaryStyle, ), ], diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart index e986ae2..ceb61d3 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart @@ -1,16 +1,4 @@ // Flutter imports: -import 'package:aku_new_community_manager/ui/widgets/common/aku_button.dart'; -import 'package:aku_new_community_manager/ui/widgets/common/aku_material_button.dart'; -import 'package:flutter/material.dart'; - -// Package imports: -import 'package:common_utils/common_utils.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; -import 'package:url_launcher/url_launcher.dart'; - // Project imports: import 'package:aku_new_community_manager/const/api.dart'; import 'package:aku_new_community_manager/const/resource.dart'; @@ -21,13 +9,26 @@ import 'package:aku_new_community_manager/tools/extensions/list_extension_tool.d import 'package:aku_new_community_manager/tools/widget_tool.dart'; import 'package:aku_new_community_manager/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart'; import 'package:aku_new_community_manager/ui/sub_pages/items_outdoor/outdoor_pass_page.dart'; +import 'package:aku_new_community_manager/ui/widgets/common/aku_button.dart'; +import 'package:aku_new_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_new_community_manager/utils/network/base_model.dart'; import 'package:aku_new_community_manager/utils/network/net_util.dart'; +// Package imports: +import 'package:common_utils/common_utils.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; class ItemsOutdoorDetailsPage extends StatefulWidget { final int id; - ItemsOutdoorDetailsPage({Key? key, /*required*/ required this.id}) : super(key: key); + + ItemsOutdoorDetailsPage({Key? key, /*required*/ required this.id}) + : super(key: key); @override _ItemsOutdoorDetailsPageState createState() => @@ -105,8 +106,8 @@ class _ItemsOutdoorDetailsPageState extends State { ), AkuBox.h(16), ...[ - _buildTile( - R.ASSETS_OUTDOOR_IC_HOME_PNG, '小区名称', '五象新区人才公寓'), + _buildTile(R.ASSETS_OUTDOOR_IC_HOME_PNG, '小区名称', + '${S.of(context)!.tempPlotName}'), _buildTile( R.ASSETS_OUTDOOR_IC_ADDRESS_PNG, '详细地址', @@ -331,7 +332,7 @@ class _ItemsOutdoorDetailsPageState extends State { ), ) : SizedBox(); - + case 2: return Container( height: 226.w, @@ -389,7 +390,7 @@ class _ItemsOutdoorDetailsPageState extends State { ], ), ); - + case 3: return Container( height: 226.w, @@ -450,7 +451,7 @@ class _ItemsOutdoorDetailsPageState extends State { ], ), ); - + default: return SizedBox(); } diff --git a/lib/ui/tool_pages/warning/warning_sub_page.dart b/lib/ui/tool_pages/warning/warning_sub_page.dart index eaa5bcc..61bc056 100644 --- a/lib/ui/tool_pages/warning/warning_sub_page.dart +++ b/lib/ui/tool_pages/warning/warning_sub_page.dart @@ -1,20 +1,19 @@ // Dart imports: import 'dart:async'; -// Flutter imports: -import 'package:aku_new_community_manager/ui/widgets/common/aku_material_button.dart'; -import 'package:flutter/material.dart'; - -// Package imports: -import 'package:bot_toast/bot_toast.dart'; -import 'package:get/get.dart'; - // Project imports: import 'package:aku_new_community_manager/style/app_style.dart'; import 'package:aku_new_community_manager/tools/widget_tool.dart'; import 'package:aku_new_community_manager/ui/tool_pages/warning/warning_detail_page.dart'; import 'package:aku_new_community_manager/ui/tool_pages/warning/warning_success.dart'; +// Flutter imports: +import 'package:aku_new_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; +// Package imports: +import 'package:bot_toast/bot_toast.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:get/get.dart'; class WarningSubPage extends StatefulWidget { WarningSubPage({Key? key}) : super(key: key); @@ -81,7 +80,7 @@ class _WarningSubPageState extends State { ], ), Text( - '人才公寓', + '${S.of(context)!.tempPlotName}', style: TextStyle( fontSize: 44.w, color: AppStyle.primaryTextColor, diff --git a/lib/ui/tool_pages/warning/warning_success.dart b/lib/ui/tool_pages/warning/warning_success.dart index 5b79914..b9df6a9 100644 --- a/lib/ui/tool_pages/warning/warning_success.dart +++ b/lib/ui/tool_pages/warning/warning_success.dart @@ -1,18 +1,17 @@ // Dart imports: import 'dart:async'; -// Flutter imports: -import 'package:aku_new_community_manager/ui/widgets/common/aku_material_button.dart'; -import 'package:flutter/material.dart'; - -// Package imports: -import 'package:get/get.dart'; - // Project imports: import 'package:aku_new_community_manager/style/app_style.dart'; import 'package:aku_new_community_manager/tools/widget_tool.dart'; import 'package:aku_new_community_manager/ui/tool_pages/warning/warning_detail_page.dart'; +// Flutter imports: +import 'package:aku_new_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +// Package imports: +import 'package:get/get.dart'; class WarningSuccess extends StatefulWidget { WarningSuccess({Key? key}) : super(key: key); @@ -52,7 +51,7 @@ class _WarningSuccessState extends State { width: 420.w, ), Text( - '人才公寓', + '${S.of(context)!.tempPlotName}', style: TextStyle( fontSize: 44.w, color: AppStyle.primaryTextColor,