From bc08c31a64774e43ff164a11e8b74a50c6f3a26b Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Fri, 24 May 2024 15:44:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=20xhj=20=E7=94=B5?=
 =?UTF-8?q?=E6=B1=A0=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/login/login/starLock_login_logic.dart     |  1 +
 .../lockDetail/lockDetail_page.dart           | 50 +++++++++++--------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/lib/login/login/starLock_login_logic.dart b/lib/login/login/starLock_login_logic.dart
index 2e3cc55e..3780c6cd 100755
--- a/lib/login/login/starLock_login_logic.dart
+++ b/lib/login/login/starLock_login_logic.dart
@@ -39,6 +39,7 @@ class StarLockLoginLogic extends BaseGetXController {
   }
 
   Future<void> login() async {
+    FocusScope.of(Get.context!).requestFocus(FocusNode());//关闭键盘
     final LoginEntity entity = await ApiRepository.to.login(
         loginType: '1',
         password: state.pwd.value,
diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart
index 96a038ad..d9f2cb91 100755
--- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart
+++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart
@@ -370,26 +370,36 @@ class _LockDetailPageState extends State<LockDetailPage>
                     SizedBox(
                       height: 15.h,
                     ),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.end,
-                      children: <Widget>[
-                        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),
-                      ],
+                    Visibility(
+                      visible: state
+                          .keyInfos.value.lockFeature!.isSupportBackupBattery ==
+                          1,
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        children: <Widget>[
+                          FlavorsImg(
+                            child: Image.asset(
+                                showElectricIcon(
+                                    state.electricQuantityStandby.value),
+                                width: 30.w,
+                                height: 24.w),
+                          ),
+                          SizedBox(width: 2.w),
+                          Text('${state.electricQuantityStandby.value}%',
+                              style: TextStyle(
+                                  fontSize: 18.sp,
+                                  color: AppColors.darkGrayTextColor)),
+                          SizedBox(width: 2.w),
+                          FlavorsImg(
+                            child: Icon(
+                              Icons.info, // 使用内置的 warning 图标，它是一个叹号
+                              color: AppColors.mainColor, // 设置图标颜色为红色
+                              size: 25.w, // 设置图标大小为 30
+                            ),
+                          ),
+                          SizedBox(width: 20.w),
+                        ],
+                      ),
                     )
                   ],
                 )