From 5ab0556f1ede7f46311c57215293470c2385a191 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Mon, 18 Sep 2023 09:44:52 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86U?= =?UTF-8?q?I=E5=B1=95=E7=A4=BA=202=EF=BC=8C=E6=A0=B9=E6=8D=AE=E7=94=B0?= =?UTF-8?q?=E6=80=BB=E9=9C=80=E6=B1=82=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/icon_main_remoteUnlocking_grey.png | Bin 0 -> 1301 bytes .../lcokSet/lockSet/lockSet_page.dart | 52 +++++++++++ .../lockDetail/lockDetail_page.dart | 81 +++++++++++++++--- .../expireLockList/expireLockList_page.dart | 14 +-- .../valueAddedServicesList_page.dart | 5 ++ 5 files changed, 128 insertions(+), 24 deletions(-) create mode 100644 star_lock/images/main/icon_main_remoteUnlocking_grey.png diff --git a/star_lock/images/main/icon_main_remoteUnlocking_grey.png b/star_lock/images/main/icon_main_remoteUnlocking_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..f4cd2cb790000476ebab8121c344085e533ea4ec GIT binary patch literal 1301 zcmV+w1?u{VP) zNPxU_IF191>n!{(Fn&%=|Fj!WP-O95!9)+SLXk}%Q^N=Ctm^7%v*%9p@7qVbj@0VDCj z!wJJHgj`}!xM1u6Ay*ECTpTbWh+QD$V(TB}1kOHk3@HafGQm?t#*S&JC-T8Z0b}>H z)Dv0%S7CfQh$s>tR$x3J?ppR^7RCdjtR-J&U_2n&n)YXOX=?(+>-DPs?fd&%uq9Qc zKB1SrBQQ*W=qUxI3}zSz7RH(VbRh#^Qs25jB&xP1^m@IT>CJ*Lk>MgeVWku;sB{%N zcZZkcU`9x0TfmMhF4U(=CgeR+g|* zKoY;-VUV1`m}a3UM94K~xShB$rp+v46$*%d6L<*0ZDhnrnR;I#0VMT3rYYATN~#$- zv!{rk;ogy3d8UtCH3Q?njTH_7;D4HOJ6{0Imqm=+MH2NlfqR}Wu<8Mc6TKp&GaSdU z#s0!TX?#Ti0M0J}a1R0izl61{?QYen0r3E9%hi;1(+j#beQsA$n<;FUraa4RnsUB6 znvyvfqt_&aN);k9m8Mp%rdhwK86z_=D9rQ@!~_gV6Fmbl0fSmzfv8X5v-d1{HN2&8 z9EW&eifY*^e4UzI;%SO@rAnoE zafv-NRt?=5Nc2CJ&{Nm znj_calJ^FKa=-C_=qvX-!UzESq$)3SN#ghI`3zEdF~gePU`UllK3yfBQy5#ND(lKq z6hI|Sd5;e36L`(vB8(?GcvbT^hjAfWi4M(?=`1RmudBGU8XeY6(NfFT5)85lL;5y+ zX9EEBiX(DKKye15DA5wShX+=KRLnj#824F*c&SSbWEa4#$hZh_EOkFPN~$AU{Yu{| zl%0U~V2EwSKO|C`eyT@Ct`Q)+!Nb51FH~Wo#32Z>uWWdKA+A6%(PQeW_<}NPBu(88 zc%G+Nb+`6r9BZoFVZ-t@KW~z(?pg(qYSoX?3EcOE4tWjvHM5#}fZ#Oj)9ljr0n*l# zKP&r;`ZuIFzihjx>CUfi`idw1;LEm4qmW_;{?TEOXxRs with RouteAware { SizedBox( height: 10.h, ), + //---田总新增展示 + CommonItem( + leftTitel: '面容开锁', + rightTitle: "", + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: + SizedBox(width: 60.w, child: _openCheckInSwitch())), + CommonItem( + leftTitel: '感应距离', + rightTitle: "远", + isHaveLine: true, + isHaveDirection: true, + ), + CommonItem( + leftTitel: '自动亮屏', + rightTitle: "", + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: + SizedBox(width: 60.w, child: _openCheckInSwitch())), + CommonItem( + leftTitel: '逗留警告', + rightTitle: "", + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: + SizedBox(width: 60.w, child: _openCheckInSwitch())), + CommonItem( + leftTitel: '异常警告', + rightTitle: "", + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: + SizedBox(width: 60.w, child: _openCheckInSwitch())), + CommonItem( + leftTitel: '开门方向设置', + rightTitle: "右开", + isHaveDirection: true, + isHaveLine: true, + ), + CommonItem( + leftTitel: '电机功率设置', + rightTitle: "大", + isHaveLine: true, + isHaveDirection: true, + ), + SizedBox( + height: 10.h, + ), + //-----新增至此 Obx(() { var title = ""; if (state.getKeyInfosData.value.roomStatus == 1) { diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 18c7f312..f3c484cd 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -130,30 +130,45 @@ class _LockDetailPageState extends State with RouteAware { child: Image.asset('images/main/icon_main_openLockBtn.png', width: 268.w, height: 268.w), )), - Visibility( - visible: - state.keyInfos.value.remoteEnable == 1 ? true : false, - child: Align( - alignment: const Alignment(0.6, 1), - child: Image.asset( - 'images/main/icon_main_remoteUnlocking.png', - width: 50.w, - height: 52.w, - ))), + // Visibility( + // visible: + // state.keyInfos.value.remoteEnable == 1 ? true : false, + // child: Align( + // alignment: const Alignment(0.6, 1), + // child: Image.asset( + // 'images/main/icon_main_remoteUnlocking.png', + // width: 50.w, + // height: 52.w, + // ))), ], ), ), SizedBox( height: 30.h, ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '门已上锁', + style: TextStyle( + fontSize: 26.sp, + color: Colors.black, + fontWeight: FontWeight.w500), + ), + ], + ), + SizedBox( + height: 6.h, + ), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Text( TranslationLoader.lanKeys!.clickUnlockAndHoldDownClose!.tr, style: TextStyle( - fontSize: 20.sp, - color: const Color(0xFFB3B3B3), + fontSize: 22.sp, + color: AppColors.btnDisableColor, fontWeight: FontWeight.w500), ), ], @@ -161,6 +176,48 @@ class _LockDetailPageState extends State with RouteAware { SizedBox( height: 30.h, ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + 'images/icon_electronicKey_admin.png', + width: 24.w, + height: 20.w, + ), + SizedBox( + width: 6.w, + ), + Text( + '超级管理员', + style: + TextStyle(fontSize: 20.sp, color: AppColors.btnDisableColor), + ), + SizedBox( + width: 80.w, + ), + Image.asset( + state.keyInfos.value.remoteEnable == 1 + ? 'images/main/icon_main_remoteUnlocking.png' + : 'images/main/icon_main_remoteUnlocking_grey.png', + width: 24.w, + height: 20.w, + // color: state.keyInfos.value.remoteEnable == 1 + // ? AppColors.btnDisableColor + // : AppColors.mainColor, + ), + SizedBox( + width: 6.w, + ), + Text( + '网关设备', + style: + TextStyle(fontSize: 20.sp, color: AppColors.btnDisableColor), + ), + ], + ), + SizedBox( + height: 20.h, + ), Divider( height: 1, color: AppColors.greyLineColor, diff --git a/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireLockList_page.dart b/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireLockList_page.dart index 42c5db0e..f6cefa19 100644 --- a/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireLockList_page.dart +++ b/star_lock/lib/mine/mineSet/lockUserManage/expireLockList/expireLockList_page.dart @@ -4,7 +4,6 @@ import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserListEntity.dart'; import 'package:star_lock/network/api_repository.dart'; -import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../appRouters.dart'; import '../../../../app_settings/app_colors.dart'; @@ -33,18 +32,9 @@ class _ExpireLockListPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: '即将到期', + barTitle: TranslationLoader.lanKeys!.aboutToExpire!.tr, haveBack: true, backgroundColor: AppColors.mainColor, - actionsList: [ - TextButton( - child: Text( - TranslationLoader.lanKeys!.aboutToExpire!.tr, - style: TextStyle(color: Colors.white, fontSize: 24.sp), - ), - onPressed: () {}, - ), - ], ), body: _buildMainUI(), ); @@ -66,7 +56,7 @@ class _ExpireLockListPageState extends State { ); } - //请求锁用户列表 + //请求即将到期列表 Future> expireLockListRequest() async { ElectronicKeyListEntity entity = await ApiRepository.to.expireLockList('0', '1', '20'); diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart index 02254dc1..b8933d26 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart @@ -71,6 +71,11 @@ class _ValueAddedServicesPageListState TranslationLoader.lanKeys!.recordsRetention!.tr, () { // Navigator.pushNamed(context, Routers.gatewayDetailPage); }), + _valueAddedServicesItem( + Image.asset('images/mine/icon_mine_valueAddedServices_vip.png'), + '可视对讲', () { + // Navigator.pushNamed(context, Routers.gatewayDetailPage); + }), _valueAddedServicesItem( Text( "A",