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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Daisy 2024-05-18 10:09:25 +08:00
commit f1a095a6b4
6 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
images/lan/lan_en.json
View File

@ -816,6 +816,7 @@
"身份证号":"ID number",
"请输入真实姓名":"Please enter your real name",
"请输入身份证号":"Please enter your ID number",
"请输入身份证号和真实姓名":"Please enter your ID number and real name",
"点击返回设备配对":"Tap Back to device pairing",
"无法连接？尝试升级":"Can't connect?Upgrade attempted",
"固件升级提示":"Firmware upgrade prompt",

1
images/lan/lan_keys.json
View File

@ -844,6 +844,7 @@
"身份证号":"身份证号",
"请输入真实姓名":"请输入真实姓名",
"请输入身份证号":"请输入身份证号",
"请输入身份证号和真实姓名":"请输入身份证号和真实姓名",
"点击返回设备配对":"点击返回设备配对",
"无法连接？尝试升级":"无法连接？尝试升级",

1
images/lan/lan_zh.json
View File

@ -815,6 +815,7 @@
"身份证号": "身份证号",
"请输入真实姓名": "请输入真实姓名",
"请输入身份证号": "请输入身份证号",
"请输入身份证号和真实姓名":"请输入身份证号和真实姓名",
"点击返回设备配对": "点击返回设备配对",
"无法连接？尝试升级": "无法连接？尝试升级",
"固件升级提示": "固件升级提示",

37
lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_page.dart
View File

@ -5,6 +5,7 @@ import 'package:get/get.dart';
import 'package:star_lock/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdminListEntity.dart';
import 'package:star_lock/tools/noData.dart';
import 'package:star_lock/tools/showCupertinoAlertView.dart';
import 'package:star_lock/tools/submitBtn.dart';
import '../../../../../appRouters.dart';
import '../../../../../app_settings/app_colors.dart';
@ -92,13 +93,35 @@ class _AuthorizedAdministratorListPageState
}
Widget _buildMainUI() {
return Obx(() => state.itemDataList.value.isEmpty
? NoData(
noDataHeight: 1.sh -
ScreenUtil().statusBarHeight -
ScreenUtil().bottomBarHeight -
190.h -
64.h)
return Obx(() => state.itemDataList.isEmpty
? Stack(
children: [
NoData(
noDataHeight: 1.sh -
ScreenUtil().statusBarHeight -
ScreenUtil().bottomBarHeight -
190.h -
64.h),
Align(
alignment: const Alignment(0.0, 0.2),
child: SizedBox(
width: 360.w,
child: SubmitBtn(
btnName: '添加授权管理员',
onClick: () {
Navigator.pushNamed(
context, Routers.addAuthorizedAdministratorPage)
.then((value) {
setState(() {
logic.pageNo = 1;
getHttpData();
});
});
}),
),
),
],
)
: SlidableAutoCloseBehavior(
child: ListView.separated(
itemCount: state.itemDataList.value.length,

1
lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:star_lock/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart';
import 'package:star_lock/tools/commonDataManage.dart';
import 'package:star_lock/tools/storage.dart';
import '../../../appRouters.dart';

6
lib/tools/showCupertinoAlertView.dart
View File

@ -221,14 +221,14 @@ class ShowCupertinoAlertView {
String name = '';
return CupertinoAlertDialog(
title: const Text('请输入身份证号和真实姓名'),
title: Text('请输入身份证号和真实姓名'.tr),
content: Column(
children: <Widget>[
SizedBox(
height: 10.h,
),
CupertinoTextField(
placeholder: '请输入身份证号',
placeholder: '请输入身份证号'.tr,
onChanged: (value) {
idCard = value;
},
@ -237,7 +237,7 @@ class ShowCupertinoAlertView {
height: 10.h,
),
CupertinoTextField(
placeholder: '请输入真实姓名',
placeholder: '请输入真实姓名'.tr,
onChanged: (value) {
name = value;
},