Merge branch 'master' of https://gitee.com/weishaoyang/star_lock
This commit is contained in:
魏少阳
commit
169e28992c
@ -285,10 +285,14 @@ class _VolumeAuthorizationLockPageState
|
||||
alignment: Alignment.center,
|
||||
child: InkWell(
|
||||
onTap: () async {
|
||||
Contact? contact = await _contactPicker.selectContact();
|
||||
Contact? currentContact =
|
||||
await _contactPicker.selectContact();
|
||||
setState(() {
|
||||
_contact = contact!;
|
||||
// print("object111111111111 ${_contact.fullName} ${_contact.phoneNumbers}");
|
||||
if (currentContact!.phoneNumbers!.isNotEmpty) {
|
||||
_emailOrPhoneController.text = currentContact
|
||||
.phoneNumbers![0]
|
||||
.replaceAll(RegExp(r"\s+\b|\b\s"), "");
|
||||
}
|
||||
});
|
||||
},
|
||||
),
|
||||
|
||||
@ -335,10 +335,14 @@ class _AddAuthorizedAdministratorPageState
|
||||
alignment: Alignment.center,
|
||||
child: InkWell(
|
||||
onTap: () async {
|
||||
Contact? contact = await _contactPicker.selectContact();
|
||||
Contact? currentContact =
|
||||
await _contactPicker.selectContact();
|
||||
setState(() {
|
||||
_contact = contact!;
|
||||
// print("object111111111111 ${_contact.fullName} ${_contact.phoneNumbers}");
|
||||
if (currentContact!.phoneNumbers!.isNotEmpty) {
|
||||
_emailOrPhoneController.text = currentContact
|
||||
.phoneNumbers![0]
|
||||
.replaceAll(RegExp(r"\s+\b|\b\s"), "");
|
||||
}
|
||||
});
|
||||
},
|
||||
),
|
||||
|
||||
109
star_lock/lib/mine/mineSet/lockGroup/groupAddLock_page.dart
Normal file
109
star_lock/lib/mine/mineSet/lockGroup/groupAddLock_page.dart
Normal file
@ -0,0 +1,109 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart';
|
||||
import 'package:star_lock/tools/noData.dart';
|
||||
import 'package:star_lock/tools/submitBtn.dart';
|
||||
|
||||
import '../../../../../app_settings/app_colors.dart';
|
||||
import '../../../../../tools/titleAppBar.dart';
|
||||
import '../../../../../translations/trans_lib.dart';
|
||||
|
||||
class GroupAddLockPage extends StatefulWidget {
|
||||
const GroupAddLockPage({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<GroupAddLockPage> createState() => _GroupAddLockPageState();
|
||||
}
|
||||
|
||||
class _GroupAddLockPageState extends State<GroupAddLockPage> {
|
||||
List<LockListItem> lockList = [];
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
dynamic obj = ModalRoute.of(context)?.settings.arguments;
|
||||
if (obj != null && (obj["lockList"] != null)) {
|
||||
lockList = obj["lockList"];
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: AppColors.mainBackgroundColor,
|
||||
appBar: TitleAppBar(
|
||||
barTitle: TranslationLoader.lanKeys!.lock!.tr,
|
||||
haveBack: true,
|
||||
actionsList: [
|
||||
IconButton(
|
||||
icon: Image.asset(
|
||||
'images/icon_bar_more.png',
|
||||
height: 30.h,
|
||||
width: 10.w,
|
||||
),
|
||||
onPressed: () {
|
||||
// 处理操作按钮的点击事件-添加锁分组
|
||||
},
|
||||
),
|
||||
],
|
||||
backgroundColor: AppColors.mainColor),
|
||||
body: lockList.isNotEmpty
|
||||
? ListView.separated(
|
||||
itemBuilder: (context, index) {
|
||||
LockListItem itemData = lockList[index];
|
||||
return _listItemView(itemData);
|
||||
},
|
||||
itemCount: lockList.length,
|
||||
separatorBuilder: (BuildContext context, int index) {
|
||||
return Divider(
|
||||
height: 1.h,
|
||||
color: AppColors.greyLineColor,
|
||||
);
|
||||
},
|
||||
)
|
||||
: Stack(
|
||||
alignment: Alignment.center,
|
||||
children: [
|
||||
Positioned(
|
||||
bottom: 350.h,
|
||||
left: (ScreenUtil().screenWidth - 200.w) / 2,
|
||||
width: 200.w,
|
||||
child: SubmitBtn(
|
||||
btnName: '添加',
|
||||
onClick: () {
|
||||
//选择要添加到分组的锁
|
||||
},
|
||||
)),
|
||||
const NoData(),
|
||||
],
|
||||
));
|
||||
}
|
||||
|
||||
Widget _listItemView(LockListItem itemData) {
|
||||
return GestureDetector(
|
||||
child: Container(
|
||||
color: Colors.white,
|
||||
height: 80.h,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 20.w,
|
||||
),
|
||||
Image.asset(
|
||||
'images/icon_lockGroup_item.png',
|
||||
width: 36,
|
||||
height: 36,
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
SizedBox(
|
||||
width: 10.w,
|
||||
),
|
||||
Text(
|
||||
itemData.lockAlias ?? '',
|
||||
style: TextStyle(fontSize: 24.sp),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
onTap: () {},
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart';
|
||||
import 'package:star_lock/tools/noData.dart';
|
||||
import 'package:star_lock/tools/submitBtn.dart';
|
||||
|
||||
import '../../../../../app_settings/app_colors.dart';
|
||||
import '../../../../../tools/titleAppBar.dart';
|
||||
@ -25,39 +26,53 @@ class _LockItemListPageState extends State<LockItemListPage> {
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: AppColors.mainBackgroundColor,
|
||||
appBar: TitleAppBar(
|
||||
barTitle: TranslationLoader.lanKeys!.lock!.tr,
|
||||
haveBack: true,
|
||||
actionsList: [
|
||||
IconButton(
|
||||
icon: Image.asset(
|
||||
'images/icon_bar_more.png',
|
||||
height: 30.h,
|
||||
width: 10.w,
|
||||
backgroundColor: AppColors.mainBackgroundColor,
|
||||
appBar: TitleAppBar(
|
||||
barTitle: TranslationLoader.lanKeys!.lock!.tr,
|
||||
haveBack: true,
|
||||
actionsList: [
|
||||
IconButton(
|
||||
icon: Image.asset(
|
||||
'images/icon_bar_more.png',
|
||||
height: 30.h,
|
||||
width: 10.w,
|
||||
),
|
||||
onPressed: () {
|
||||
// 处理操作按钮的点击事件-添加锁分组
|
||||
},
|
||||
),
|
||||
onPressed: () {
|
||||
// 处理操作按钮的点击事件-添加锁分组
|
||||
},
|
||||
),
|
||||
],
|
||||
backgroundColor: AppColors.mainColor),
|
||||
body: lockList.isNotEmpty
|
||||
? ListView.separated(
|
||||
itemBuilder: (context, index) {
|
||||
LockListItem itemData = lockList[index];
|
||||
return _listItemView(itemData);
|
||||
},
|
||||
itemCount: lockList.length,
|
||||
separatorBuilder: (BuildContext context, int index) {
|
||||
return Divider(
|
||||
height: 1.h,
|
||||
color: AppColors.greyLineColor,
|
||||
);
|
||||
},
|
||||
)
|
||||
: const NoData(),
|
||||
);
|
||||
],
|
||||
backgroundColor: AppColors.mainColor),
|
||||
body: lockList.isNotEmpty
|
||||
? ListView.separated(
|
||||
itemBuilder: (context, index) {
|
||||
LockListItem itemData = lockList[index];
|
||||
return _listItemView(itemData);
|
||||
},
|
||||
itemCount: lockList.length,
|
||||
separatorBuilder: (BuildContext context, int index) {
|
||||
return Divider(
|
||||
height: 1.h,
|
||||
color: AppColors.greyLineColor,
|
||||
);
|
||||
},
|
||||
)
|
||||
: Stack(
|
||||
alignment: Alignment.center,
|
||||
children: [
|
||||
Positioned(
|
||||
bottom: 350.h,
|
||||
left: (ScreenUtil().screenWidth - 200.w) / 2,
|
||||
width: 200.w,
|
||||
child: SubmitBtn(
|
||||
btnName: '添加',
|
||||
onClick: () {
|
||||
//选择要添加到分组的锁
|
||||
},
|
||||
)),
|
||||
const NoData(),
|
||||
],
|
||||
));
|
||||
}
|
||||
|
||||
Widget _listItemView(LockListItem itemData) {
|
||||
|
||||
@ -156,6 +156,10 @@ class _ValueAddedServicesHighFunctionPageState
|
||||
TranslationLoader.lanKeys!.markedHouseState!.tr),
|
||||
_buildItem("images/mine/icon_mine_highFunctionContent_fkgj.png",
|
||||
TranslationLoader.lanKeys!.cardIssuingtool!.tr),
|
||||
_buildItem(
|
||||
"images/mine/icon_mine_highFunctionContent_fkgj.png", '推送'),
|
||||
_buildItem(
|
||||
"images/mine/icon_mine_highFunctionContent_fkgj.png", '考勤'),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@ -28,20 +28,20 @@ class _ValueAddedServicesPageListState
|
||||
backgroundColor: AppColors.mainColor),
|
||||
body: ListView(
|
||||
children: [
|
||||
_valueAddedServicesItem(
|
||||
Image.asset('images/mine/icon_mine_valueAddedServices_note.png'),
|
||||
TranslationLoader.lanKeys!.note!.tr, () {
|
||||
Navigator.pushNamed(
|
||||
context, Routers.valueAddedServicesNoteAndEmailDetailPage,
|
||||
arguments: 1);
|
||||
}),
|
||||
_valueAddedServicesItem(
|
||||
Image.asset('images/mine/icon_mine_valueAddedServices_email.png'),
|
||||
TranslationLoader.lanKeys!.mail!.tr, () {
|
||||
Navigator.pushNamed(
|
||||
context, Routers.valueAddedServicesNoteAndEmailDetailPage,
|
||||
arguments: 2);
|
||||
}),
|
||||
// _valueAddedServicesItem(
|
||||
// Image.asset('images/mine/icon_mine_valueAddedServices_note.png'),
|
||||
// TranslationLoader.lanKeys!.note!.tr, () {
|
||||
// Navigator.pushNamed(
|
||||
// context, Routers.valueAddedServicesNoteAndEmailDetailPage,
|
||||
// arguments: 1);
|
||||
// }),
|
||||
// _valueAddedServicesItem(
|
||||
// Image.asset('images/mine/icon_mine_valueAddedServices_email.png'),
|
||||
// TranslationLoader.lanKeys!.mail!.tr, () {
|
||||
// Navigator.pushNamed(
|
||||
// context, Routers.valueAddedServicesNoteAndEmailDetailPage,
|
||||
// arguments: 2);
|
||||
// }),
|
||||
_valueAddedServicesItem(
|
||||
Image.asset(
|
||||
'images/mine/icon_mine_valueAddedServices_realName.png'),
|
||||
@ -55,27 +55,27 @@ class _ValueAddedServicesPageListState
|
||||
Navigator.pushNamed(
|
||||
context, Routers.valueAddedServicesHighFunctionPage);
|
||||
}),
|
||||
_valueAddedServicesItem(
|
||||
Image.asset('images/mine/icon_mine_valueAddedServices_push.png'),
|
||||
TranslationLoader.lanKeys!.pushMessage!.tr, () {
|
||||
Navigator.pushNamed(context, Routers.gatewayDetailPage);
|
||||
}),
|
||||
_valueAddedServicesItem(
|
||||
Image.asset(
|
||||
'images/mine/icon_mine_valueAddedServices_checkIn.png'),
|
||||
TranslationLoader.lanKeys!.checkingIn!.tr, () {
|
||||
Navigator.pushNamed(context, Routers.gatewayDetailPage);
|
||||
}),
|
||||
// _valueAddedServicesItem(
|
||||
// Image.asset('images/mine/icon_mine_valueAddedServices_push.png'),
|
||||
// TranslationLoader.lanKeys!.pushMessage!.tr, () {
|
||||
// Navigator.pushNamed(context, Routers.gatewayDetailPage);
|
||||
// }),
|
||||
// _valueAddedServicesItem(
|
||||
// Image.asset(
|
||||
// 'images/mine/icon_mine_valueAddedServices_checkIn.png'),
|
||||
// TranslationLoader.lanKeys!.checkingIn!.tr, () {
|
||||
// Navigator.pushNamed(context, Routers.gatewayDetailPage);
|
||||
// }),
|
||||
_valueAddedServicesItem(
|
||||
Image.asset(
|
||||
'images/mine/icon_mine_valueAddedServices_storage.png'),
|
||||
TranslationLoader.lanKeys!.recordsRetention!.tr, () {
|
||||
Navigator.pushNamed(context, Routers.gatewayDetailPage);
|
||||
Toast.show(msg: "功能暂未开放");
|
||||
}),
|
||||
_valueAddedServicesItem(
|
||||
Image.asset('images/mine/icon_mine_valueAddedServices_vip.png'),
|
||||
'可视对讲', () {
|
||||
Navigator.pushNamed(context, Routers.gatewayDetailPage);
|
||||
Toast.show(msg: "功能暂未开放");
|
||||
}),
|
||||
_valueAddedServicesItem(
|
||||
Text(
|
||||
@ -86,7 +86,7 @@ class _ValueAddedServicesPageListState
|
||||
fontWeight: FontWeight.w600),
|
||||
),
|
||||
"Amazon Alexa", () {
|
||||
Navigator.pushNamed(context, Routers.gatewayDetailPage);
|
||||
Toast.show(msg: "功能暂未开放");
|
||||
}),
|
||||
_valueAddedServicesItem(
|
||||
Text(
|
||||
@ -97,7 +97,7 @@ class _ValueAddedServicesPageListState
|
||||
fontWeight: FontWeight.w600),
|
||||
),
|
||||
"Google Home", () {
|
||||
Navigator.pushNamed(context, Routers.gatewayDetailPage);
|
||||
Toast.show(msg: "功能暂未开放");
|
||||
}),
|
||||
],
|
||||
),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user