1，更新部分UI展示

2，根据田总需求新增部分展示文字

star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -186,6 +187,57 @@ class _LockSetPageState extends State<LockSetPage> 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) {

star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart

@@ -130,30 +130,45 @@ class _LockDetailPageState extends State<LockDetailPage> with RouteAware {
                 child: Image.asset('images/main/icon_main_openLockBtn.png',
                     width: 268.w, height: 268.w),
               )),
-              Visibility(
+              // Visibility(
-                  visible:
+              //     visible:
-                      state.keyInfos.value.remoteEnable == 1 ? true : false,
+              //         state.keyInfos.value.remoteEnable == 1 ? true : false,
-                  child: Align(
+              //     child: Align(
-                      alignment: const Alignment(0.6, 1),
+              //         alignment: const Alignment(0.6, 1),
-                      child: Image.asset(
+              //         child: Image.asset(
-                        'images/main/icon_main_remoteUnlocking.png',
+              //           'images/main/icon_main_remoteUnlocking.png',
-                        width: 50.w,
+              //           width: 50.w,
-                        height: 52.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,
+                  fontSize: 22.sp,
-                  color: const Color(0xFFB3B3B3),
+                  color: AppColors.btnDisableColor,
                   fontWeight: FontWeight.w500),
             ),
           ],
@@ -161,6 +176,48 @@ class _LockDetailPageState extends State<LockDetailPage> 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,

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<ExpireLockListPage> {
     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<ExpireLockListPage> {
     );
   }
 
-  //请求锁用户列表
+  //请求即将到期列表
   Future<List<LockUserData>> expireLockListRequest() async {
     ElectronicKeyListEntity entity =
         await ApiRepository.to.expireLockList('0', '1', '20');

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",