From a6e21dbe244a87a9b3d1355e203e9406264a8cdb Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Sun, 16 Jan 2022 15:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=B0=8F=E5=8C=BA=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/l10n/app_zh.arb | 4 ++-- lib/pages/renovation_manage/renovation_manage_card.dart | 4 +++- .../renovation_manage/renovation_manage_detail_page.dart | 3 ++- lib/pages/renovation_manage/renovation_manage_page.dart | 1 + lib/pages/service_browse/service_browse_page.dart | 7 ++++++- .../surrounding_enterprises_page.dart | 7 ++++++- lib/ui/market/order/my_order_card.dart | 3 ++- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index dc4ada6b..5680c25f 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -1,9 +1,9 @@ { - "appName": "智慧小区", + "appName": "华脉新村小区", "@appName": { "description": "应用名称" }, - "tempPlotName": "人才公寓智慧小区", + "tempPlotName": "华脉新村小区", "@tempPlotName": { "description": "临时使用的小区名称" } diff --git a/lib/pages/renovation_manage/renovation_manage_card.dart b/lib/pages/renovation_manage/renovation_manage_card.dart index f1e13fa6..2415fb15 100644 --- a/lib/pages/renovation_manage/renovation_manage_card.dart +++ b/lib/pages/renovation_manage/renovation_manage_card.dart @@ -2,6 +2,7 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/pages/renovation_manage/renovation_manage_detail_page.dart'; import 'package:aku_new_community/pages/renovation_manage/renovation_map.dart'; +import 'package:aku_new_community/utils/headers.dart'; import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -55,7 +56,8 @@ class _RenovationManageCardState extends State { ], ), 24.w.heightBox, - _buildTile(R.ASSETS_ICONS_ARTICLE_NAME_PNG, '小区名称', '人才公寓'), + _buildTile(R.ASSETS_ICONS_ARTICLE_NAME_PNG, '小区名称', + '${S.of(context)!.tempPlotName}'), 12.w.heightBox, _buildTile( R.ASSETS_ICONS_APPOINTMENT_ADDRESS_PNG, diff --git a/lib/pages/renovation_manage/renovation_manage_detail_page.dart b/lib/pages/renovation_manage/renovation_manage_detail_page.dart index 4ee03ec9..cc72e492 100644 --- a/lib/pages/renovation_manage/renovation_manage_detail_page.dart +++ b/lib/pages/renovation_manage/renovation_manage_detail_page.dart @@ -3,6 +3,7 @@ import 'dart:math'; import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/pages/renovation_manage/renovation_map.dart'; +import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; @@ -197,7 +198,7 @@ class _RenovationManageDetailPageState [ _buildInfoCard( tag: '家', - midTop: '人才公寓', + midTop: '${S.of(context)!.tempPlotName}', midBottom: '1幢-1单元-302', name: '业主：' + '马泽鹏', phone: '13720183183', diff --git a/lib/pages/renovation_manage/renovation_manage_page.dart b/lib/pages/renovation_manage/renovation_manage_page.dart index 3d887d54..0d4ed9f6 100644 --- a/lib/pages/renovation_manage/renovation_manage_page.dart +++ b/lib/pages/renovation_manage/renovation_manage_page.dart @@ -3,6 +3,7 @@ import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart'; import 'package:flutter/material.dart'; +@Deprecated('弃用') class RenovationManagePage extends StatefulWidget { RenovationManagePage({Key? key}) : super(key: key); diff --git a/lib/pages/service_browse/service_browse_page.dart b/lib/pages/service_browse/service_browse_page.dart index 0ae09901..545388ab 100644 --- a/lib/pages/service_browse/service_browse_page.dart +++ b/lib/pages/service_browse/service_browse_page.dart @@ -3,6 +3,7 @@ import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/models/service_browse/service_browse_list_mode.dart'; import 'package:aku_new_community/pages/service_browse/service_browse_detail_page.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; @@ -89,7 +90,11 @@ class _ServiceBrowsePageState 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.createDate, format: 'MM-dd HH:mm')}' .text diff --git a/lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart b/lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart index 6de8b8bd..0fa71c46 100644 --- a/lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart +++ b/lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart @@ -26,6 +26,7 @@ class _SurroundingEnterprisesPageState EasyRefreshController _refreshController = EasyRefreshController(); int _page = 1; int _size = 10; + @override void initState() { super.initState(); @@ -94,7 +95,11 @@ class _SurroundingEnterprisesPageState Spacer(), Row( children: [ - '南宁人才公寓'.text.size(20.sp).color(ktextThirdColor).make(), + '${S.of(context)!.tempPlotName}' + .text + .size(20.sp) + .color(ktextThirdColor) + .make(), Spacer(), '发布于：${model.getReleaseDate}' .text diff --git a/lib/ui/market/order/my_order_card.dart b/lib/ui/market/order/my_order_card.dart index 6c7e2244..b03aab42 100644 --- a/lib/ui/market/order/my_order_card.dart +++ b/lib/ui/market/order/my_order_card.dart @@ -8,6 +8,7 @@ import 'package:aku_new_community/ui/market/order/my_order_detail_page.dart'; import 'package:aku_new_community/ui/market/order/my_order_evaluation_page.dart'; import 'package:aku_new_community/ui/market/order/my_order_func.dart'; import 'package:aku_new_community/ui/market/order/my_order_refund_page.dart'; +import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:flutter/material.dart'; @@ -128,7 +129,7 @@ class _MyOrderCardState extends State { 40.w.heightBox, ...[ _rowTile('下单时间', widget.model.arrivalDateString), - _rowTile('到达地点', '人才公寓小区北侧门口'), + _rowTile('到达地点', '${S.of(context)!.tempPlotName}北侧门口'), _rowTile('发货时间', widget.model.sendDateString), ].sepWidget(separate: 16.w.heightBox), ..._bottomWidget(),