1，电子钥匙状态管理

2，演示模式下 电子钥匙模块、密码模块、授权管理员模块处理
3，删除密码、授权管理员 回到列表页 未更新问题修复
4，发送电子钥匙完成后页面 要统一显示分享（同密码）

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_logic.dart

@@ -0,0 +1,48 @@
+import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_state.dart';
+import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
+import 'package:star_lock/network/api_repository.dart';
+import 'package:star_lock/tools/baseGetXController.dart';
+
+class AuthorizedAdminListLogic extends BaseGetXController {
+  final AuthorizedAdminListState state = AuthorizedAdminListState();
+
+  //请求电子钥匙列表
+  Future<List<ElectronicKeyListItem>> mockNetworkDataRequest() async {
+    ElectronicKeyListEntity entity = await ApiRepository.to.electronicKeyList(
+        '0',
+        state.keyInfo.value.keyId.toString(),
+        '',
+        state.keyInfo.value.lockId.toString(),
+        '',
+        state.pageNum.toString(),
+        state.pageSize.toString(),
+        '0',
+        '0');
+    List<ElectronicKeyListItem> dataList = [];
+    if (entity.errorCode!.codeIsSuccessful) {
+      print("电子钥匙列表成功:${entity.data?.itemList}");
+      if (entity.data != null) {
+        dataList = entity.data!.itemList;
+      }
+    }
+    state.itemDataList.value = dataList;
+    return dataList;
+  }
+
+  @override
+  void onReady() {
+    // TODO: implement onReady
+    super.onReady();
+  }
+
+  @override
+  void onInit() {
+    // TODO: implement onInit
+    super.onInit();
+  }
+
+  @override
+  void onClose() {
+    // TODO: implement onClose
+  }
+}

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart

@@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
+import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_logic.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
-import 'package:star_lock/main/lockMian/entity/lockInfoEntity.dart';
-import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/noData.dart';
+import 'package:star_lock/tools/storage.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
@@ -23,27 +22,75 @@ class AuthorizedAdminListPage extends StatefulWidget {
 }
 
 class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
-  late KeyInfos keyInfo;
+  final logic = Get.put(AuthorizedAdminListLogic());
-  late LockMainEntity lockMainEntity;
+  final state = Get.find<AuthorizedAdminListLogic>().state;
+
+  // late KeyInfos keyInfo;
+  // late LockMainEntity lockMainEntity;
+
+  @override
+  void initState() {
+    super.initState();
+
+    mockRequest();
+  }
+
+  Future<void> mockRequest() async {
+    // 获取是否是演示模式 演示模式不获取接口
+    var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
+    if (isDemoMode == false) {
+      logic.mockNetworkDataRequest();
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
-    dynamic obj = ModalRoute.of(context)?.settings.arguments;
+    // dynamic obj = ModalRoute.of(context)?.settings.arguments;
-    if (obj != null && (obj["lockMainEntity"] != null)) {
+    // if (obj != null && (obj["lockMainEntity"] != null)) {
-      lockMainEntity = obj["lockMainEntity"];
+    //   lockMainEntity = obj["lockMainEntity"];
-    }
+    // }
-    if (obj != null && (obj["keyInfo"] != null)) {
+    // if (obj != null && (obj["keyInfo"] != null)) {
-      keyInfo = obj["keyInfo"];
+    //   keyInfo = obj["keyInfo"];
-    }
+    // }
 
     return Scaffold(
-      backgroundColor: AppColors.mainBackgroundColor,
+        backgroundColor: AppColors.mainBackgroundColor,
-      appBar: TitleAppBar(
+        appBar: TitleAppBar(
-        barTitle: TranslationLoader.lanKeys!.authorizedAdmin!.tr,
+          barTitle: TranslationLoader.lanKeys!.authorizedAdmin!.tr,
-        haveBack: true,
+          haveBack: true,
-        backgroundColor: AppColors.mainColor,
+          backgroundColor: AppColors.mainColor,
-      ),
+        ),
-      body: FutureBuilder<List<ElectronicKeyListItem>>(
+        body: Column(
+          children: [
+            Expanded(
+                child: Obx(() => state.itemDataList.value.isEmpty
+                    ? const NoData()
+                    : _buildMainUI(state.itemDataList.value))),
+            SizedBox(
+              height: 20.h,
+            ),
+            AddBottomWhiteBtn(
+              btnName: TranslationLoader.lanKeys!.addAuthorizedAdmin!.tr,
+              onClick: () {
+                Navigator.pushNamed(context, Routers.authorizedAdminManagePage,
+                    arguments: {
+                      "lockMainEntity": state.lockMainEntity.value,
+                      "keyInfo": state.keyInfo.value
+                    }).then((val) {
+                  if (val != null) {
+                    logic.mockNetworkDataRequest();
+                    setState(() {});
+                  }
+                });
+              },
+            ),
+            SizedBox(
+              height: 64.h,
+            )
+          ],
+        )
+        /*
+      FutureBuilder<List<ElectronicKeyListItem>>(
           future: mockNetworkDataRequest(),
           builder: (BuildContext context,
               AsyncSnapshot<List<ElectronicKeyListItem>> snapshot) {
@@ -90,31 +137,32 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
               return Container();
             }
           }),
-    );
+          */
+        );
   }
 
-  //请求授权管理员列表 跟电子钥匙列表的接口一样，但必须在参数中加keyRight=1为授权管理员
+  // //请求授权管理员列表 跟电子钥匙列表的接口一样，但必须在参数中加keyRight=1为授权管理员
-  Future<List<ElectronicKeyListItem>> mockNetworkDataRequest() async {
+  // Future<List<ElectronicKeyListItem>> mockNetworkDataRequest() async {
-    ElectronicKeyListEntity entity = await ApiRepository.to.electronicKeyList(
+  //   ElectronicKeyListEntity entity = await ApiRepository.to.electronicKeyList(
-        '0',
+  //       '0',
-        keyInfo.keyId.toString(),
+  //       keyInfo.keyId.toString(),
-        '',
+  //       '',
-        keyInfo.lockId.toString(),
+  //       keyInfo.lockId.toString(),
-        '',
+  //       '',
-        '1',
+  //       '1',
-        '20',
+  //       '20',
-        '0',
+  //       '0',
-        '1');
+  //       '1');
-    if (entity.errorCode!.codeIsSuccessful) {
+  //   if (entity.errorCode!.codeIsSuccessful) {
-      print("电子钥匙列表成功:${entity.data?.itemList}");
+  //     print("电子钥匙列表成功:${entity.data?.itemList}");
-    }
+  //   }
-    if (entity.data != null) {
+  //   if (entity.data != null) {
-      return entity.data!.itemList;
+  //     return entity.data!.itemList;
-    } else {
+  //   } else {
-      List<ElectronicKeyListItem> dataList = [];
+  //     List<ElectronicKeyListItem> dataList = [];
-      return dataList;
+  //     return dataList;
-    }
+  //   }
-  }
+  // }
 
   Widget _buildMainUI(itemData) {
     List<ElectronicKeyListItem> getItemData = itemData;
@@ -143,7 +191,12 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
               return _electronicKeyItem('images/controls_user.png',
                   indexEntity.keyName!, useDateStr, keyStatus, isAdminKey, () {
                 Navigator.pushNamed(context, Routers.electronicKeyDetailPage,
-                    arguments: {'itemData': indexEntity});
+                    arguments: {'itemData': indexEntity}).then((val) {
+                  if (val != null) {
+                    logic.mockNetworkDataRequest();
+                    setState(() {});
+                  }
+                });
               });
             });
   }

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_state.dart

@@ -0,0 +1,17 @@
+import 'package:get/get.dart';
+import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
+import 'package:star_lock/main/lockMian/entity/lockInfoEntity.dart';
+
+class AuthorizedAdminListState {
+  final keyInfo = KeyInfos().obs;
+  final lockMainEntity = LockMainEntity().obs;
+  var pageNum = 1.obs; //请求页码
+  final pageSize = 20.obs; //请求每页数据条数
+  final itemDataList = <ElectronicKeyListItem>[].obs;
+
+  AuthorizedAdminListState() {
+    Map map = Get.arguments;
+    lockMainEntity.value = map["lockMainEntity"];
+    keyInfo.value = map["keyInfo"];
+  }
+}

star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart

@@ -8,7 +8,6 @@ import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/jh_pop_menus.dart';
-import 'package:star_lock/tools/showCupertinoAlert.dart';
 import 'package:star_lock/tools/toast.dart';
 
 import '../../../../../appRouters.dart';

star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_logic.dart

@@ -19,15 +19,15 @@ class ElectronicKeyListLogic extends BaseGetXController {
         state.pageSize.toString(),
         '0',
         '0');
+    List<ElectronicKeyListItem> dataList = [];
     if (entity.errorCode!.codeIsSuccessful) {
       print("电子钥匙列表成功:${entity.data?.itemList}");
+      if (entity.data != null) {
+        dataList = entity.data!.itemList;
+      }
     }
-    if (entity.data != null) {
+    state.itemDataList.value = dataList;
-      return entity.data!.itemList;
+    return dataList;
-    } else {
-      List<ElectronicKeyListItem> dataList = [];
-      return dataList;
-    }
   }
 
   //电子钥匙重置请求

star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart

@@ -7,6 +7,7 @@ import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_logic.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
 import 'package:star_lock/tools/noData.dart';
+import 'package:star_lock/tools/storage.dart';
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/submitBtn.dart';
@@ -24,35 +25,76 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
   final logic = Get.put(ElectronicKeyListLogic());
   final state = Get.find<ElectronicKeyListLogic>().state;
   late RefreshController _refreshController;
-  late List<ElectronicKeyListItem> itemDataList = [];
+  // late List<ElectronicKeyListItem> itemDataList = [];
 
   @override
   void initState() {
     super.initState();
     _refreshController = RefreshController(initialRefresh: true);
+
+    mockRequest();
+  }
+
+  Future<void> mockRequest() async {
+    // 获取是否是演示模式 演示模式不获取接口
+    var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
+    if (isDemoMode == false) {
+      logic.mockNetworkDataRequest();
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: AppColors.mainBackgroundColor,
+        backgroundColor: AppColors.mainBackgroundColor,
-      appBar: TitleAppBar(
+        appBar: TitleAppBar(
-        barTitle: TranslationLoader.lanKeys!.electronicKey!.tr,
+          barTitle: TranslationLoader.lanKeys!.electronicKey!.tr,
-        haveBack: true,
+          haveBack: true,
-        backgroundColor: AppColors.mainColor,
+          backgroundColor: AppColors.mainColor,
-        actionsList: [
+          actionsList: [
-          TextButton(
+            TextButton(
-            child: Text(
+              child: Text(
-              TranslationLoader.lanKeys!.reset!.tr,
+                TranslationLoader.lanKeys!.reset!.tr,
-              style: TextStyle(color: Colors.white, fontSize: 24.sp),
+                style: TextStyle(color: Colors.white, fontSize: 24.sp),
+              ),
+              onPressed: () {
+                _showDialog(context);
+              },
             ),
-            onPressed: () {
+          ],
-              _showDialog(context);
+        ),
-            },
+        body: Column(
-          ),
+          children: [
-        ],
+            _searchWidget(),
-      ),
+            SizedBox(
-      body: FutureBuilder<List<ElectronicKeyListItem>>(
+              height: 20.h,
+            ),
+            Expanded(
+                child: Obx(() => state.itemDataList.value.isEmpty
+                    ? const NoData()
+                    : _buildMainUI(state.itemDataList.value))),
+            AddBottomWhiteBtn(
+              btnName: TranslationLoader.lanKeys!.sendKey!.tr,
+              onClick: () {
+                Navigator.pushNamed(
+                    context, Routers.sendElectronicKeyManagePage, arguments: {
+                  "lockMainEntity": state.lockMainEntity.value,
+                  "keyInfo": state.keyInfo.value
+                }).then((val) {
+                  if (val != null) {
+                    logic.mockNetworkDataRequest();
+                    setState(() {});
+                  }
+                });
+              },
+            ),
+            SizedBox(
+              height: 64.h,
+            )
+          ],
+        )
+        /*
+      FutureBuilder<List<ElectronicKeyListItem>>(
           future: logic.mockNetworkDataRequest(),
           builder: (BuildContext context,
               AsyncSnapshot<List<ElectronicKeyListItem>> snapshot) {
@@ -115,13 +157,14 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
               return Container();
             }
           }),
-    );
+          */
+        );
   }
 
   ///加载更多函数
   Future<void> _loadMore() async {
     if (state.pageNum.value == 1) {
-      if (itemDataList.length < 10) {
+      if (state.itemDataList.value.length < 10) {
         _refreshController.loadComplete();
       } else {
         state.pageNum.value++;
@@ -209,7 +252,6 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
               setState(() {});
             }
           });
-          ;
         });
       },
       separatorBuilder: (BuildContext context, int index) {

star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_state.dart

@@ -1,12 +1,13 @@
 import 'package:get/get.dart';
+import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
 import 'package:star_lock/main/lockMian/entity/lockInfoEntity.dart';
-import 'package:star_lock/mine/mineSet/mineSet/userSettingInfoEntity.dart';
 
 class ElectronicKeyListState {
   final keyInfo = KeyInfos().obs;
   final lockMainEntity = LockMainEntity().obs;
   var pageNum = 1.obs; //请求页码
   final pageSize = 20.obs; //请求每页数据条数
+  final itemDataList = <ElectronicKeyListItem>[].obs;
 
   ElectronicKeyListState() {
     Map map = Get.arguments;

star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_pickers/pickers.dart';
 import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -28,6 +29,7 @@ class SendElectronicKeyPage extends StatefulWidget {
 class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
   final logic = Get.put(SendElectronicKeyLogic());
   final state = Get.find<SendElectronicKeyLogic>().state;
+  static const methodChannel = MethodChannel('flutter_native_ios');
 
   @override
   void initState() {
@@ -345,21 +347,22 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
           height: 10.h,
         ),
         OutLineBtn(
-          btnName: '邮件通知',
+          btnName: '分享',
           onClick: () {
-            Navigator.pushNamed(context, Routers.sendEmailNotificationPage);
+            // Navigator.pushNamed(context, Routers.sendEmailNotificationPage);
+            _openModalBottomSheet();
           },
         ),
         SizedBox(
           height: 10.h,
         ),
-        OutLineBtn(
+        // OutLineBtn(
-          btnName: '微信通知',
+        //   btnName: '微信通知',
-          onClick: () {},
+        //   onClick: () {},
-        ),
+        // ),
-        SizedBox(
+        // SizedBox(
-          height: 10.h,
+        //   height: 10.h,
-        ),
+        // ),
         OutLineBtn(
           btnName: '标记为已入住',
           onClick: () {
@@ -484,4 +487,126 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
   String intToStr(int v) {
     return (v < 10) ? "0$v" : "$v";
   }
+
+  Future _openModalBottomSheet() async {
+    showModalBottomSheet(
+        context: context,
+        shape: RoundedRectangleBorder(
+            borderRadius: BorderRadiusDirectional.circular(10)),
+        constraints: BoxConstraints(maxHeight: 260.h),
+        builder: (BuildContext context) {
+          return Column(
+            children: [
+              SizedBox(
+                width: ScreenUtil().screenWidth,
+                height: 180.h,
+                child: ListView(
+                    scrollDirection: Axis.horizontal, //横向滚动
+                    children: initBottomSheetList()),
+              ),
+              Container(
+                height: 8.h,
+                color: AppColors.greyBackgroundColor,
+              ),
+              TextButton(
+                style: ButtonStyle(
+                    overlayColor:
+                        MaterialStateProperty.all<Color>(Colors.white)),
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                      color: Colors.black, fontSize: ScreenUtil().setSp(24)),
+                ),
+                onPressed: () {
+                  Navigator.pop(context);
+                },
+              )
+            ],
+          );
+        });
+  }
+
+  List<Widget> initBottomSheetList() {
+    List<Widget> widgetList = [];
+
+    widgetList.add(buildCenter3('images/icon_wechat.png', '微信好友', 0));
+    widgetList.add(buildCenter3('images/icon_message.png', '短信', 1));
+    widgetList.add(buildCenter3('images/icon_email.png', '邮件', 2));
+    widgetList.add(buildCenter3('images/icon_more.png', '更多', 3));
+
+    return widgetList;
+  }
+
+  GestureDetector buildCenter3(
+      String imageName, String titleStr, int itemIndex) {
+    return GestureDetector(
+      child: Container(
+        width: 120.w,
+        // height: 64.h,
+        margin:
+            EdgeInsets.only(top: 20.w, bottom: 20.w, left: 10.w, right: 10.w),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Image.asset(
+              imageName,
+              width: 50.w,
+              height: 50.h,
+            ),
+            SizedBox(
+              height: 16.w,
+            ),
+            Text(
+              titleStr,
+              style: TextStyle(
+                  fontSize: ScreenUtil().setSp(20), color: Colors.black),
+            ),
+          ],
+        ),
+      ),
+      onTap: () => _jumpSmartDeviceRoute(itemIndex),
+    );
+  }
+
+  _jumpSmartDeviceRoute(int itemIndex) {
+    switch (itemIndex) {
+      case 0:
+        //微信好友
+        {
+          Navigator.pop(context);
+          String pwdShareStr = '您好，您的电子钥匙生成成功';
+          tokNative('flutter_sharePassword_to_ios',
+              arguments: {'pwdShareStr': pwdShareStr}).then((result) {
+            print('$result');
+          });
+          print('与原生交互');
+        }
+        break;
+      case 1:
+        //短信
+        {}
+        break;
+      case 2:
+        //邮件
+        {
+          Navigator.pop(context);
+          Navigator.pushNamed(context, Routers.sendEmailNotificationPage);
+        }
+        break;
+      case 3:
+        //更多
+        {}
+        break;
+      default:
+    }
+  }
+
+  static Future<dynamic> tokNative(String method,
+      {required Map arguments}) async {
+    if (arguments == null) {
+      return await methodChannel.invokeMethod(method);
+    } else {
+      return await methodChannel.invokeMethod(method, arguments);
+    }
+  }
 }

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

@@ -515,29 +515,57 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
     );
   }
 
-  void showCupertinoAlertDialog(
+  //确认弹窗
-    BuildContext context,
+  void showCupertinoAlertDialog(widgetContext) {
-  ) {
+    showCupertinoDialog(
-    showDialog(
+      context: widgetContext,
-      context: context,
+      builder: (context) {
-      builder: (BuildContext context) {
+        return CupertinoAlertDialog(
-        return ShowIosTipView(
+          title: const Text('创建公司号,考勤功能才能使用'),
-          title: "提示",
+          actions: [
-          tipTitle: "创建公司号，考勤功能才能使用",
+            CupertinoDialogAction(
-          sureClick: () {
+              child: Text(TranslationLoader.lanKeys!.cancel!.tr),
-            //
+              onPressed: () {
-            Navigator.pop(context);
+                Navigator.of(context).pop();
-            Get.toNamed(Routers.checkInCreatCompanyPage,
+              },
-                arguments: state.getKeyInfosData.value);
+            ),
-          },
+            CupertinoDialogAction(
-          cancelClick: () {
+              child: Text(TranslationLoader.lanKeys!.sure!.tr),
-            Navigator.pop(context);
+              onPressed: () {
-          },
+                Navigator.pop(context);
+                Get.toNamed(Routers.checkInCreatCompanyPage,
+                    arguments: state.getKeyInfosData.value);
+              },
+            ),
+          ],
         );
       },
     );
   }
 
+  // void showCupertinoAlertDialog(
+  //   BuildContext context,
+  // ) {
+  //   showDialog(
+  //     context: context,
+  //     builder: (BuildContext context) {
+  //       return ShowIosTipView(
+  //         title: "提示",
+  //         tipTitle: "创建公司号，考勤功能才能使用",
+  //         sureClick: () {
+  //           //
+  //           Navigator.pop(context);
+  //           Get.toNamed(Routers.checkInCreatCompanyPage,
+  //               arguments: state.getKeyInfosData.value);
+  //         },
+  //         cancelClick: () {
+  //           Navigator.pop(context);
+  //         },
+  //       );
+  //     },
+  //   );
+  // }
+
   void showDeletPasswordAlertDialog(
     BuildContext context,
   ) {

star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart

@@ -1,4 +1,3 @@
-import 'package:date_format/date_format.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -193,7 +192,6 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
                   padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
                   onClick: () {
                     deletePwdRequest();
-                    Navigator.pop(context, true);
                   }),
             ],
           ),
@@ -278,6 +276,9 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
         itemData.lockId.toString(), itemData.keyboardPwdId.toString(), 1);
     if (entity.errorCode!.codeIsSuccessful) {
       Toast.show(msg: "删除成功");
+      setState(() {
+        Navigator.pop(context, true);
+      });
     }
   }
 
@@ -409,6 +410,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
       case 0:
         //微信好友
         {
+          Navigator.pop(context);
           String pwdShareStr =
               '您好，您的密码是：${itemData.keyboardPwd}\n生效时间：${itemData.startDate}\n类型：永久\n锁名：${itemData.keyboardPwdName}';
           tokNative('flutter_sharePassword_to_ios',
@@ -425,6 +427,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
       case 2:
         //邮件
         {
+          Navigator.pop(context);
           Navigator.pushNamed(context, Routers.sendEmailNotificationPage);
         }
         break;

star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_logic.dart

@@ -15,15 +15,15 @@ class PasswordKeyListLogic extends BaseGetXController {
         '0',
         state.pageNum.toString(),
         state.pageSize.toString());
+    List<PasswordKeyListItem> dataList = [];
     if (entity.errorCode!.codeIsSuccessful) {
       print("密码钥匙列表成功:${entity.data?.itemList}");
+      if (entity.data != null) {
+        dataList = entity.data!.itemList!;
+      }
     }
-    if (entity.data != null) {
+    state.itemDataList.value = dataList;
-      return entity.data!.itemList!;
+    return dataList;
-    } else {
-      List<PasswordKeyListItem> dataList = [];
-      return dataList;
-    }
   }
 
   //密码钥匙重置请求

star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart

@@ -6,6 +6,7 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyListEntity.dart';
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_logic.dart';
 import 'package:star_lock/tools/noData.dart';
+import 'package:star_lock/tools/storage.dart';
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/submitBtn.dart';
@@ -22,7 +23,7 @@ class PasswordKeyListPage extends StatefulWidget {
 class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
   final logic = Get.put(PasswordKeyListLogic());
   final state = Get.find<PasswordKeyListLogic>().state;
-  late List<PasswordKeyListItem> _itemDataList = [];
+  // late List<PasswordKeyListItem> _itemDataList = [];
 
   late RefreshController _refreshController;
 
@@ -30,29 +31,70 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
   void initState() {
     super.initState();
     _refreshController = RefreshController(initialRefresh: true);
+    mockRequest();
+  }
+
+  Future<void> mockRequest() async {
+    // 获取是否是演示模式 演示模式不获取接口
+    var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
+    if (isDemoMode == false) {
+      logic.mockNetworkDataRequest();
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: AppColors.mainBackgroundColor,
+        backgroundColor: AppColors.mainBackgroundColor,
-      appBar: TitleAppBar(
+        appBar: TitleAppBar(
-        barTitle: TranslationLoader.lanKeys!.password!.tr,
+          barTitle: TranslationLoader.lanKeys!.password!.tr,
-        haveBack: true,
+          haveBack: true,
-        backgroundColor: AppColors.mainColor,
+          backgroundColor: AppColors.mainColor,
-        actionsList: [
+          actionsList: [
-          TextButton(
+            TextButton(
-            child: Text(
+              child: Text(
-              TranslationLoader.lanKeys!.reset!.tr,
+                TranslationLoader.lanKeys!.reset!.tr,
-              style: TextStyle(color: Colors.white, fontSize: 24.sp),
+                style: TextStyle(color: Colors.white, fontSize: 24.sp),
+              ),
+              onPressed: () {
+                _showDialog(context);
+              },
             ),
-            onPressed: () {
+          ],
-              _showDialog(context);
+        ),
-            },
+        body: Column(
-          ),
+          children: [
-        ],
+            _searchWidget(),
-      ),
+            SizedBox(
-      body: FutureBuilder<List<PasswordKeyListItem>>(
+              height: 20.h,
+            ),
+            Expanded(
+                child: Obx(() => state.itemDataList.value.isEmpty
+                    ? const NoData()
+                    : _buildMainUI(state.itemDataList.value))),
+            SizedBox(
+              height: 20.h,
+            ),
+            AddBottomWhiteBtn(
+                btnName: TranslationLoader.lanKeys!.getPassword!.tr,
+                onClick: () {
+                  Navigator.pushNamed(context, Routers.passwordKeyManagePage,
+                      arguments: {
+                        "lockMainEntity": state.lockMainEntity.value,
+                        "keyInfo": state.keyInfo.value
+                      }).then((val) {
+                    if (val != null) {
+                      logic.mockNetworkDataRequest();
+                    }
+                  });
+                }),
+            SizedBox(
+              height: 42.h,
+            )
+          ],
+        )
+        /*
+      FutureBuilder<List<PasswordKeyListItem>>(
           future: logic.mockNetworkDataRequest(),
           builder: (BuildContext context,
               AsyncSnapshot<List<PasswordKeyListItem>> snapshot) {
@@ -119,13 +161,14 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
               return Container();
             }
           }),
-    );
+          */
+        );
   }
 
   ///加载更多函数
   Future<void> _loadMore() async {
     if (state.pageNum.value == 1) {
-      if (_itemDataList.length < 10) {
+      if (state.itemDataList.length < 10) {
         _refreshController.loadComplete();
       } else {
         state.pageNum.value++;
@@ -195,7 +238,12 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
         return _electronicKeyItem('images/controls_user.png',
             indexEntity.keyboardPwdName!, useDateStr, () {
           Navigator.pushNamed(context, Routers.passwordKeyDetailPage,
-              arguments: {"itemData": indexEntity});
+              arguments: {"itemData": indexEntity}).then((val) {
+            if (val != null) {
+              logic.mockNetworkDataRequest();
+            }
+          });
+          ;
         });
       },
       separatorBuilder: (BuildContext context, int index) {

star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_state.dart

@@ -1,4 +1,5 @@
 import 'package:get/get.dart';
+import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyListEntity.dart';
 import 'package:star_lock/main/lockMian/entity/lockInfoEntity.dart';
 
 class PasswordKeyListState {
@@ -6,6 +7,7 @@ class PasswordKeyListState {
   final lockMainEntity = LockMainEntity().obs;
   var pageNum = 1.obs; //请求页码
   final pageSize = 20.obs; //请求每页数据条数
+  final itemDataList = <PasswordKeyListItem>[].obs;
 
   PasswordKeyListState() {
     Map map = Get.arguments;

star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -26,7 +25,6 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
   void initState() {
     // TODO: implement initState
     super.initState();
-
   }
 
   @override
@@ -34,25 +32,21 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
     return Scaffold(
         backgroundColor: AppColors.mainBackgroundColor,
         appBar: TitleAppBar(
-        barTitle: "演示模式",
+          barTitle: "演示模式",
-        haveBack: true,
+          haveBack: true,
-        backgroundColor: AppColors.mainColor,
+          backgroundColor: AppColors.mainColor,
-    ),
+        ),
-    body: Container(
+        body: Container(
-      width: 1.sw,
+          width: 1.sw,
-      height: 1.sh - ScreenUtil().statusBarHeight * 2,
+          height: 1.sh - ScreenUtil().statusBarHeight * 2,
-      color: Colors.white,
+          color: Colors.white,
-      child: Column(
+          child: Column(
-        children: [
+            children: [topTip(), topWidget(), Expanded(child: bottomWidget())],
-          topTip(),
+          ),
-          topWidget(),
+        ));
-          Expanded(child: bottomWidget())
-        ],
-      ),
-    ));
   }
 
-  Widget topTip(){
+  Widget topTip() {
     return Container(
       // height: 120.h,
       width: 1.sw,
@@ -61,7 +55,10 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
         children: [
           Row(
             children: [
-              Expanded(child: Text("提示:当前界面为展示界面,添加设备后才能继续使用", style: TextStyle(fontSize: 24.sp, color: AppColors.mainColor))),
+              Expanded(
+                  child: Text("提示:当前界面为展示界面,添加设备后才能继续使用",
+                      style: TextStyle(
+                          fontSize: 24.sp, color: AppColors.mainColor))),
             ],
           ),
         ],
@@ -82,7 +79,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
                 child: Text(
                   "TMH_78f16712781a",
                   style:
-                  TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w400),
+                      TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w400),
                 )),
             Row(
               mainAxisAlignment: MainAxisAlignment.end,
@@ -112,12 +109,12 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
             children: [
               Center(
                   child: GestureDetector(
-                    onTap: () {
+                onTap: () {
-                      gotoLogin();
+                  gotoLogin();
-                    },
+                },
-                    child: Image.asset('images/main/icon_main_openLockBtn.png',
+                child: Image.asset('images/main/icon_main_openLockBtn.png',
-                        width: 268.w, height: 268.w),
+                    width: 268.w, height: 268.w),
-                  )),
+              )),
             ],
           ),
         ),
@@ -168,12 +165,13 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
             Text(
               '超级管理员',
               style:
-              TextStyle(fontSize: 20.sp, color: AppColors.btnDisableColor),
+                  TextStyle(fontSize: 20.sp, color: AppColors.btnDisableColor),
             ),
             SizedBox(
               width: 80.w,
             ),
-            Image.asset('images/main/icon_main_remoteUnlocking_grey.png',
+            Image.asset(
+              'images/main/icon_main_remoteUnlocking_grey.png',
               // state.keyInfos.value.remoteEnable == 1
               //     ? 'images/main/icon_main_remoteUnlocking.png'
               //     : 'images/main/icon_main_remoteUnlocking_grey.png',
@@ -189,7 +187,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
             Text(
               '网关设备',
               style:
-              TextStyle(fontSize: 20.sp, color: AppColors.btnDisableColor),
+                  TextStyle(fontSize: 20.sp, color: AppColors.btnDisableColor),
             ),
           ],
         ),
@@ -227,58 +225,57 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
 
     // 考勤
     // if (state.keyInfos.value.isAttendance == 1) {
-      showWidgetArr.add(bottomItem('images/main/icon_main_clockingIn.png',
+    showWidgetArr.add(bottomItem('images/main/icon_main_clockingIn.png',
-          TranslationLoader.lanKeys!.checkingIn!.tr, () {
+        TranslationLoader.lanKeys!.checkingIn!.tr, () {
-            // gotoLogin();
+      // gotoLogin();
-            Get.toNamed(Routers.checkingInListPage, arguments: KeyInfos());
+      Get.toNamed(Routers.checkingInListPage, arguments: KeyInfos());
-          }));
+    }));
     // }
 
     var defaultWidgetArr = [
       // 电子钥匙
       bottomItem('images/main/icon_main_electronicKey.png',
           TranslationLoader.lanKeys!.electronicKey!.tr, () {
-            gotoLogin();
+        // gotoLogin();
 
-            // Get.toNamed(Routers.electronicKeyListPage, arguments: {
+        Get.toNamed(Routers.electronicKeyListPage, arguments: {
-            //   "lockMainEntity": widget.lockMainEntity,
+          "lockMainEntity": LockMainEntity(),
-            //   "keyInfo": widget.keyInfo
+          "keyInfo": KeyInfos()
-            // });
+        });
-          }),
+      }),
 
       // 密码
       bottomItem('images/main/icon_main_password.png',
           TranslationLoader.lanKeys!.password!.tr, () {
-            gotoLogin();
-
-            // Get.toNamed(Routers.passwordKeyListPage, arguments: {
-            //   "lockMainEntity": widget.lockMainEntity,
-            //   "keyInfo": widget.keyInfo
-            // });
-          }),
-
-      // ic卡
-      bottomItem('images/main/icon_main_icCard.png', TranslationLoader.lanKeys!.card!.tr, () {
         // gotoLogin();
 
-        Get.toNamed(Routers.otherTypeKeyListPage, arguments: {
+        Get.toNamed(Routers.passwordKeyListPage, arguments: {
-          "lockId": 0,
+          "lockMainEntity": LockMainEntity(),
-          "fromType": 0
+          "keyInfo": KeyInfos()
         });
       }),
 
+      // ic卡
+      bottomItem('images/main/icon_main_icCard.png',
+          TranslationLoader.lanKeys!.card!.tr, () {
+        // gotoLogin();
+
+        Get.toNamed(Routers.otherTypeKeyListPage,
+            arguments: {"lockId": 0, "fromType": 0});
+      }),
+
       // 指纹
-      bottomItem('images/main/icon_main_fingerprint.png', TranslationLoader.lanKeys!.fingerprint!.tr, () {
+      bottomItem('images/main/icon_main_fingerprint.png',
+          TranslationLoader.lanKeys!.fingerprint!.tr, () {
         // gotoLogin();
 
-        Get.toNamed(Routers.otherTypeKeyListPage, arguments: {
+        Get.toNamed(Routers.otherTypeKeyListPage,
-          "lockId": 1,
+            arguments: {"lockId": 1, "fromType": 1});
-          "fromType": 1
-        });
       }),
 
       // 遥控
-      bottomItem('images/main/icon_main_remoteControl.png', TranslationLoader.lanKeys!.remoteControl!.tr, () {
+      bottomItem('images/main/icon_main_remoteControl.png',
+          TranslationLoader.lanKeys!.remoteControl!.tr, () {
         gotoLogin();
 
         // Get.toNamed(Routers.otherTypeKeyListPage, arguments: {
@@ -315,25 +312,26 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
       // 授权管理员
       bottomItem('images/main/icon_main_authorizedAdmin.png',
           TranslationLoader.lanKeys!.authorizedAdmin!.tr, () {
-            gotoLogin();
+        // gotoLogin();
 
-            // Get.toNamed(Routers.authorizedAdminListPage, arguments: {
+        Get.toNamed(Routers.authorizedAdminListPage, arguments: {
-            //   "keyInfo": KeyInfos()
+          "lockMainEntity": LockMainEntity(),
-            // });
+          "keyInfo": KeyInfos()
-          }),
+        });
+      }),
       // 操作记录
       bottomItem('images/main/icon_main_operatingRecord.png',
           TranslationLoader.lanKeys!.operatingRecord!.tr, () {
-            // gotoLogin();
+        // gotoLogin();
-            Get.toNamed(Routers.lockOperatingRecordPage, arguments: {
+        Get.toNamed(Routers.lockOperatingRecordPage,
-              "keyInfo": KeyInfos()
+            arguments: {"keyInfo": KeyInfos()});
-            });
+      }),
-          }),
       // 设置
       bottomItem(
-          'images/main/icon_main_set.png', TranslationLoader.lanKeys!.set!.tr, () {
+          'images/main/icon_main_set.png', TranslationLoader.lanKeys!.set!.tr,
-            Get.toNamed(Routers.demoModeLockSetPage);
+          () {
-          }),
+        Get.toNamed(Routers.demoModeLockSetPage);
+      }),
     ];
     showWidgetArr.addAll(endWiddget);
     return showWidgetArr;
@@ -345,7 +343,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
     return GestureDetector(
       onTap: onClick,
       child: Container(
-        // height: 300.h,
+          // height: 300.h,
           color: Colors.white,
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.center,
@@ -367,7 +365,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
     );
   }
 
-  void gotoLogin(){
+  void gotoLogin() {
     // Get.toNamed(Routers.seletLockTypePage);
     Toast.show(msg: "演示模式");
   }