From c31afd3ef65217d3875e14171236c53c7f5d8896 Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Tue, 21 May 2024 18:35:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=20=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checkingInStaffList_page.dart | 18 +++++++++++++++--- .../lockDetail/lockDetail/lockDetail_page.dart | 2 -- .../lockMian/entity/lockListInfo_entity.dart | 5 +++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart index 2b0e1afe..9f58f45e 100755 --- a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart @@ -145,9 +145,21 @@ class _CheckingInStaffListPageState extends State { SizedBox( width: 20.w, ), - // CustomNetworkImage(url: staffListItem.headurl!, width: 40.w , height: 40.w), - Image.asset(getTypeIcon(staffListItem.attendanceType!), - width: 60.w, height: 60.w), + if (staffListItem.headurl == null || staffListItem.headurl == '') + Image.asset( + getTypeIcon(staffListItem.attendanceType!), + width: 60.w, + height: 60.w, + ) + else + ClipRRect( + borderRadius: BorderRadius.circular(100.w), + child: Image.network( + staffListItem.headurl!, + width: 60.w, + height: 60.w, + ), + ), SizedBox( width: 20.w, ), diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 97d42890..4f7db2a3 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -1326,7 +1326,6 @@ class _LockDetailPageState extends State state.iSOpenLock.value = true; state.openLockBtnState.value = 1; state.animationController!.forward(); - AppLog.log('点击开锁'); if (state.isOpenLockNeedOnline.value == 0) { // 不需要联网 @@ -1348,7 +1347,6 @@ class _LockDetailPageState extends State state.iSOpenLock.value = false; state.openLockBtnState.value = 1; state.animationController!.forward(); - EasyLoading.showToast('正在尝试闭锁……'.tr, duration: 2000.milliseconds); AppLog.log('长按闭锁'); if (state.isOpenLockNeedOnline.value == 0) { diff --git a/lib/main/lockMian/entity/lockListInfo_entity.dart b/lib/main/lockMian/entity/lockListInfo_entity.dart index 950d7639..4e484fc3 100755 --- a/lib/main/lockMian/entity/lockListInfo_entity.dart +++ b/lib/main/lockMian/entity/lockListInfo_entity.dart @@ -252,6 +252,11 @@ class LockListInfoItemEntity { data['hasGateway'] = hasGateway; return data; } + + //是否是锁拥有者 也代表是超级管理员 + bool isLockOwnerBool(){ + return isLockOwner== 1; + } } class Bluetooth {