From 24b1b0c3e5cc40a91389b8bae739d021c412ed18 Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Tue, 28 May 2024 18:14:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=91=AB=E6=B3=93?= =?UTF-8?q?=E4=BD=B3=E5=88=97=E8=A1=A8=E9=A1=B5=E8=AE=BE=E5=A4=87=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lockMian/lockList/lockList_xhj_page.dart | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/lib/main/lockMian/lockList/lockList_xhj_page.dart b/lib/main/lockMian/lockList/lockList_xhj_page.dart index 137a5ba0..37e18bef 100755 --- a/lib/main/lockMian/lockList/lockList_xhj_page.dart +++ b/lib/main/lockMian/lockList/lockList_xhj_page.dart @@ -184,7 +184,7 @@ class _LockListXHJPageState extends State with RouteAware { borderRadius: BorderRadius.circular(20.w), ), child: Padding( - padding: EdgeInsets.symmetric(horizontal: 30.w, vertical: 10.h), + padding: EdgeInsets.symmetric(horizontal: 15.w, vertical: 5.h), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, @@ -193,25 +193,28 @@ class _LockListXHJPageState extends State with RouteAware { children: [ Image.asset( 'images/icon_lock_circle.png', - width: 32.r, - height: 32.r, + width: 48.r, + height: 48.r, color: AppColors.mainColor, ), ], ), SizedBox( - height: 15.h, + height: 10.h, + ), + FittedBox( + fit: BoxFit.scaleDown, + child: Text(keyInfo.lockAlias!, + style: TextStyle( + fontSize: 24.sp, + fontWeight: FontWeight.w500, + color: keyInfo.passageMode == 1 + ? AppColors.openPassageModeColor + : AppColors.darkGrayTextColor, + overflow: TextOverflow.ellipsis, + ), + maxLines: 1), ), - Text(keyInfo.lockAlias!, - style: TextStyle( - fontSize: 32.sp, - fontWeight: FontWeight.w500, - color: keyInfo.passageMode == 1 - ? AppColors.openPassageModeColor - : AppColors.darkGrayTextColor, - overflow: TextOverflow.ellipsis, - ), - maxLines: 1), Visibility( visible: keyInfo.passageMode == 1, child: Padding( @@ -287,7 +290,7 @@ class _LockListXHJPageState extends State with RouteAware { ? '超级管理员'.tr : (keyInfo.keyRight == 1 ? '授权管理员'.tr : '普通用户'.tr), style: TextStyle( - fontSize: 18.sp, color: AppColors.darkGrayTextColor), + fontSize: 16.sp, color: AppColors.darkGrayTextColor), ), ), Image.asset( @@ -299,7 +302,7 @@ class _LockListXHJPageState extends State with RouteAware { Text( '${keyInfo.electricQuantity!}%', style: TextStyle( - fontSize: 18.sp, color: AppColors.darkGrayTextColor), + fontSize: 16.sp, color: AppColors.darkGrayTextColor), ), ], ), @@ -308,7 +311,7 @@ class _LockListXHJPageState extends State with RouteAware { keyInfo.startDate, keyInfo.endDate, keyInfo.keyType)) .join('\u{200B}'), style: TextStyle( - fontSize: 18.sp, color: AppColors.darkGrayTextColor), + fontSize: 16.sp, color: AppColors.darkGrayTextColor), ) ], ),