From 7a785587dbe94d84741644caa727f5ffc86b317c Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Wed, 8 May 2024 14:07:58 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E7=94=B5=E5=AD=90=E9=92=A5=E5=8C=99?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=A1=A5=E5=85=85=E9=83=A8=E5=88=86=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=202=EF=BC=8C=E7=94=B5=E5=AD=90=E9=92=A5?= =?UTF-8?q?=E5=8C=99=E6=A8=A1=E5=9D=97=E8=B7=B3=E8=BD=AC=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E6=94=B9=E4=B8=BAGet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/images/lan/lan_en.json | 6 ++++- star_lock/images/lan/lan_keys.json | 6 ++++- star_lock/images/lan/lan_zh.json | 6 ++++- .../electronicKeyDetail_page.dart | 24 +++++++++---------- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index c15fcfa9..6f49af6f 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -825,5 +825,9 @@ "传输中'":"In transit", "操作记录":"Operation record", "修改姓名":"Modify name", - "传输中":"In transit" + "传输中":"In transit", + "发送人":"Sender", + "发送时间":"Send time", + "钥匙详情":"Key details", + "姓名":"Name" } diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index 0d7ea293..71c4ff0c 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -853,5 +853,9 @@ "传输中'":"传输中", "操作记录":"操作记录", "修改姓名":"修改姓名", - "传输中":"传输中" + "传输中":"传输中", + "发送人":"发送人", + "发送时间":"发送时间", + "钥匙详情":"钥匙详情", + "姓名":"姓名" } diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index f1d85ccb..51ca17a4 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -856,5 +856,9 @@ "传输中'":"传输中", "操作记录":"操作记录", "修改姓名":"修改姓名", - "传输中":"传输中" + "传输中":"传输中", + "发送人":"发送人", + "发送时间":"发送时间", + "钥匙详情":"钥匙详情", + "姓名":"姓名" } diff --git a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart index 3771b298..082976a8 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart @@ -13,7 +13,6 @@ import '../../../../../tools/dateTool.dart'; import '../../../../../tools/showTFView.dart'; import '../../../../../tools/submitBtn.dart'; import '../../../../../tools/titleAppBar.dart'; -import '../../../../../translations/trans_lib.dart'; class ElectronicKeyDetailPage extends StatefulWidget { const ElectronicKeyDetailPage({Key? key}) : super(key: key); @@ -33,7 +32,7 @@ class _ElectronicKeyDetailPageState extends State { resizeToAvoidBottomInset: false, backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.keyDetail!.tr, + barTitle: '钥匙详情'.tr, haveBack: true, actionsList: (state.keyType.value != 3) ? [ @@ -53,7 +52,7 @@ class _ElectronicKeyDetailPageState extends State { body: ListView( children: [ Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.name!.tr, + leftTitel: '姓名'.tr, rightTitle: state.keyName.value, isHaveDirection: true, isHaveLine: true, @@ -61,7 +60,7 @@ class _ElectronicKeyDetailPageState extends State { showCupertinoAlertDialog(context); })), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.periodValidity!.tr, + leftTitel: '有效期'.tr, allHeight: 70.h, // rightTitle:"2023.09.19 11:27\n2023.09.25 11:27", rightTitle: logic.getKeyTypeShowDateTime(), @@ -116,7 +115,7 @@ class _ElectronicKeyDetailPageState extends State { Obx(() => Visibility( visible: state.keyType.value == 4 ? true : false, child: Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.effectiveDay!.tr, + leftTitel: '有效日'.tr, rightTitle: state.weekDay.value.join(','), isHaveDirection: true, isHaveLine: true, @@ -167,11 +166,11 @@ class _ElectronicKeyDetailPageState extends State { rightTitle: state.itemData.value.username ?? ""), const SizedBox(height: 1), CommonItem( - leftTitel: TranslationLoader.lanKeys!.sender!.tr, + leftTitel: "发送人".tr, rightTitle: state.itemData.value.senderUsername ?? ""), const SizedBox(height: 1), CommonItem( - leftTitel: TranslationLoader.lanKeys!.senderTime!.tr, + leftTitel: '发送时间'.tr, rightTitle: DateTool() .dateToYMDHNString(state.itemData.value.sendDate.toString())), Container(height: 10.h), @@ -216,11 +215,10 @@ class _ElectronicKeyDetailPageState extends State { rightTitle: "", isHaveDirection: true, action: () { - Navigator.pushNamed(context, Routers.keyOperationRecordPage, - arguments: { - 'lockId': state.itemData.value.lockId.toString(), - 'keyId': state.itemData.value.keyId.toString() - }); + Get.toNamed(Routers.keyOperationRecordPage, arguments: { + 'lockId': state.itemData.value.lockId.toString(), + 'keyId': state.itemData.value.keyId.toString() + }); }), Container(height: 40.h), SubmitBtn( @@ -298,7 +296,7 @@ class _ElectronicKeyDetailPageState extends State { } }, cancelClick: () { - Navigator.pop(context); + Get.back(); }, ); },