sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1，电子钥匙模块补充部分国际化

Browse Source 
2，电子钥匙模块跳转方式改为Get
This commit is contained in:
Daisy 2024-05-08 14:07:58 +08:00
parent 45fb12506a
commit 7a785587db
4 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
star_lock/images/lan/lan_en.json
View File

@ -825,5 +825,9 @@
"传输中'":"In transit",
"操作记录":"Operation record",
"修改姓名":"Modify name",
"传输中":"In transit"
"传输中":"In transit",
"发送人":"Sender",
"发送时间":"Send time",
"钥匙详情":"Key details",
"姓名":"Name"
}

6
star_lock/images/lan/lan_keys.json
View File

@ -853,5 +853,9 @@
"传输中'":"传输中",
"操作记录":"操作记录",
"修改姓名":"修改姓名",
"传输中":"传输中"
"传输中":"传输中",
"发送人":"发送人",
"发送时间":"发送时间",
"钥匙详情":"钥匙详情",
"姓名":"姓名"
}

6
star_lock/images/lan/lan_zh.json
View File

@ -856,5 +856,9 @@
"传输中'":"传输中",
"操作记录":"操作记录",
"修改姓名":"修改姓名",
"传输中":"传输中"
"传输中":"传输中",
"发送人":"发送人",
"发送时间":"发送时间",
"钥匙详情":"钥匙详情",
"姓名":"姓名"
}

24
star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart
View File

@ -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<ElectronicKeyDetailPage> {
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<ElectronicKeyDetailPage> {
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<ElectronicKeyDetailPage> {
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<ElectronicKeyDetailPage> {
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<ElectronicKeyDetailPage> {
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<ElectronicKeyDetailPage> {
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<ElectronicKeyDetailPage> {
}
},
cancelClick: () {
Navigator.pop(context);
Get.back();
},
);
},