diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 00570d8d..fc7b6e7d 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -102,7 +102,9 @@ class _LockDetailPageState extends State child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Text("钥匙将在2天后失效", style: TextStyle(color: const Color(0xffCBA74B),fontSize: 24.sp)) + Text("钥匙将在2天后失效", + style: TextStyle( + color: const Color(0xffCBA74B), fontSize: 24.sp)) ], ), ), @@ -132,7 +134,7 @@ class _LockDetailPageState extends State ], // ), ), - )) + )), ], ), ), @@ -176,57 +178,62 @@ class _LockDetailPageState extends State )))), Positioned( child: Obx(() => Column( - children: [ - GestureDetector( - onTap: (){ - // logic.getStarLockStatus(); - showDeletAlertDialog(context, DateTool().dateToYMDHNSString(state.keyInfos.value.electricQuantityDate!.toString())); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Image.asset( - showElectricIcon(state.electricQuantity.value), - width: 30.w, - height: 24.w), - SizedBox(width: 2.w), - Text("${state.electricQuantity.value}%", - style: TextStyle( - fontSize: 18.sp, - color: AppColors.darkGrayTextColor)), - SizedBox(width: 2.w), - Icon( - Icons.info, // 使用内置的 warning 图标,它是一个叹号 - color: AppColors.mainColor, // 设置图标颜色为红色 - size: 25.w, // 设置图标大小为 30 - ), - SizedBox(width: 20.w), - ], - ), - ), - Row( - mainAxisAlignment: MainAxisAlignment.end, children: [ - Image.asset( - showElectricIcon(state.electricQuantity.value), - width: 30.w, - height: 24.w), - SizedBox(width: 2.w), - Text("--%", - style: TextStyle( - fontSize: 18.sp, - color: AppColors.darkGrayTextColor)), - SizedBox(width: 2.w), - Icon( - Icons.info, // 使用内置的 warning 图标,它是一个叹号 - color: AppColors.mainColor, // 设置图标颜色为红色 - size: 25.w, // 设置图标大小为 30 + GestureDetector( + onTap: () { + // logic.getStarLockStatus(); + showDeletAlertDialog( + context, + DateTool().dateToYMDHNSString(state + .keyInfos.value.electricQuantityDate! + .toString())); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Image.asset( + showElectricIcon( + state.electricQuantity.value), + width: 30.w, + height: 24.w), + SizedBox(width: 2.w), + Text("${state.electricQuantity.value}%", + style: TextStyle( + fontSize: 18.sp, + color: AppColors.darkGrayTextColor)), + SizedBox(width: 2.w), + Icon( + Icons.info, // 使用内置的 warning 图标,它是一个叹号 + color: AppColors.mainColor, // 设置图标颜色为红色 + size: 25.w, // 设置图标大小为 30 + ), + SizedBox(width: 20.w), + ], + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Image.asset( + showElectricIcon(state.electricQuantity.value), + width: 30.w, + height: 24.w), + SizedBox(width: 2.w), + Text("--%", + style: TextStyle( + fontSize: 18.sp, + color: AppColors.darkGrayTextColor)), + SizedBox(width: 2.w), + Icon( + Icons.info, // 使用内置的 warning 图标,它是一个叹号 + color: AppColors.mainColor, // 设置图标颜色为红色 + size: 25.w, // 设置图标大小为 30 + ), + SizedBox(width: 20.w), + ], ), - SizedBox(width: 20.w), ], - ), - ], - ))) + ))) ], ), SizedBox(height: 30.h), @@ -455,7 +462,7 @@ class _LockDetailPageState extends State child: GridView.count( crossAxisCount: 4, // childAspectRatio: 3, - crossAxisSpacing: 20.w, + crossAxisSpacing: 25.h, mainAxisSpacing: 0.h, physics: const NeverScrollableScrollPhysics(), children: getBottomWidget()), @@ -694,7 +701,9 @@ class _LockDetailPageState extends State SizedBox(height: 10.w), Expanded( child: Text(name, - style: TextStyle(fontSize: 20.sp, color: isForbidden + style: TextStyle( + fontSize: 20.sp, + color: isForbidden ? AppColors.lockDetailBottomBtnUneable : AppColors.blackColor), textAlign: TextAlign.center))