From b819179255eaf44070d77701308319fa247eb908 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Fri, 20 Oct 2023 13:55:17 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E2=80=94=E7=9F=AD=E4=BF=A1=E3=80=81=E9=82=AE=E4=BB=B6=E6=A0=8F?= =?UTF-8?q?=E5=88=A0=E6=8E=89=20=E2=80=94>=E9=AB=98=E7=BA=A7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=86=85=E5=90=88=E5=B9=B6=E2=80=9C=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E2=80=9D=E3=80=81=E2=80=9C=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E2=80=9D=202=EF=BC=8C=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E3=80=81=E8=80=83=E5=8B=A4=E2=80=94>=E6=94=BE=E5=88=B0?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E5=8A=9F=E8=83=BD=E9=87=8C=203=EF=BC=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=9D=E5=AD=98=E3=80=81=E5=8F=AF=E8=A7=86?= =?UTF-8?q?=E5=AF=B9=E8=AE=B2=E3=80=81Alex=E3=80=81Google=E2=80=94>?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9A=82=E6=9C=AA=E5=BC=80=E6=94=BE=204?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E7=BB=84=E4=B8=BA=E9=9B=B6-=E7=82=B9?= =?UTF-8?q?=E8=BF=9B=E5=8E=BB-=20=E6=9A=82=E6=97=A0=E6=95=B0=E6=8D=AE&?= =?UTF-8?q?=E5=8F=AF=E6=B7=BB=E5=8A=A0=E9=94=81(+=E5=8E=BB=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E9=92=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volumeAuthorizationLock_page.dart | 10 +- .../addAuthorizedAdministrator_page.dart | 10 +- .../mineSet/lockGroup/groupAddLock_page.dart | 109 ++++++++++++++++++ .../mineSet/lockGroup/lockItemList_page.dart | 79 ++++++++----- .../valueAddedServicesHighFunction_page.dart | 4 + .../valueAddedServicesList_page.dart | 58 +++++----- 6 files changed, 203 insertions(+), 67 deletions(-) create mode 100644 star_lock/lib/mine/mineSet/lockGroup/groupAddLock_page.dart diff --git a/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart b/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart index b5fafa4e..968e1d8b 100644 --- a/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart +++ b/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart @@ -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"), ""); + } }); }, ), diff --git a/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart b/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart index fabdf376..ef820af2 100644 --- a/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart +++ b/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart @@ -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"), ""); + } }); }, ), diff --git a/star_lock/lib/mine/mineSet/lockGroup/groupAddLock_page.dart b/star_lock/lib/mine/mineSet/lockGroup/groupAddLock_page.dart new file mode 100644 index 00000000..ec5fb1bb --- /dev/null +++ b/star_lock/lib/mine/mineSet/lockGroup/groupAddLock_page.dart @@ -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 createState() => _GroupAddLockPageState(); +} + +class _GroupAddLockPageState extends State { + List 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: () {}, + ); + } +} diff --git a/star_lock/lib/mine/mineSet/lockGroup/lockItemList_page.dart b/star_lock/lib/mine/mineSet/lockGroup/lockItemList_page.dart index 0389e961..6e6dd66f 100644 --- a/star_lock/lib/mine/mineSet/lockGroup/lockItemList_page.dart +++ b/star_lock/lib/mine/mineSet/lockGroup/lockItemList_page.dart @@ -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 { } 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) { diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart index 5a31c99b..2384e41a 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart @@ -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", '考勤'), ], ), ), diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart index 845d4fa0..d9be9057 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart @@ -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: "功能暂未开放"); }), ], ),