From a869a882868c22b155dc8485dc39b582514a17c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com>
Date: Mon, 18 Sep 2023 09:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_lock/lib/appRouters.dart                 |  6 +----
 .../lockDetail/lockDetail_page.dart           |  2 +-
 star_lock/lib/network/api_provider.dart       | 24 +++++++------------
 star_lock/lib/network/api_repository.dart     |  8 -------
 4 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/star_lock/lib/appRouters.dart b/star_lock/lib/appRouters.dart
index 50f23081..230a3d0b 100644
--- a/star_lock/lib/appRouters.dart
+++ b/star_lock/lib/appRouters.dart
@@ -7,7 +7,6 @@ import 'package:get/get.dart';
 import 'package:star_lock/common/safetyVerification/safetyVerification_binding.dart';
 import 'package:star_lock/login/register/starLock_register_binding.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_page.dart';
-import 'package:star_lock/main/lockDetail/checkingIn/checkingInSetStaffList/checkingInStaffList_page.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart';
 import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_main_page.dart';
@@ -773,10 +772,7 @@ abstract class AppRouters {
     GetPage(
         name: Routers.checkInCreatCompanyPage, page: () => const CheckInCreatCompanyPage()),
     GetPage(
-        name: Routers.checkingInStaffDetailPage, page: () => const CheckingInStaffDetailPage())
-
-        name: Routers.checkInCreatCompanyPage,
-        page: () => const CheckInCreatCompanyPage()),
+        name: Routers.checkingInStaffDetailPage, page: () => const CheckingInStaffDetailPage()),
     GetPage(
         name: Routers.administratorDetailsPage,
         page: () => const AdministratorDetailsPage()),
diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
index ddef9ed3..41d89e01 100644
--- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
+++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
@@ -240,7 +240,7 @@ class _LockDetailPageState extends State<LockDetailPage> with RouteAware {
           "lockId": widget.keyInfo.lockId,
           "fromType": 2
         });
-
+      }),
     ];
     showWidgetArr.addAll(defaultWidgetArr);
 
diff --git a/star_lock/lib/network/api_provider.dart b/star_lock/lib/network/api_provider.dart
index 1bec24cb..e84b3b6f 100644
--- a/star_lock/lib/network/api_provider.dart
+++ b/star_lock/lib/network/api_provider.dart
@@ -115,8 +115,7 @@ class ApiProvider extends BaseProvider {
             'pageSize': pageSize,
             'startDate': startDate,
             'keyRight': keyRight
-          }),
-          isShowLoading: true);
+          }));
 
   Future<Response> sendElectronicKey(
           String createUser,
@@ -253,8 +252,7 @@ class ApiProvider extends BaseProvider {
             'keyboardPwdId': keyboardPwdId,
             'cardId': cardId,
             'fingerprintId': fingerprintId
-          }),
-          isShowLoading: true);
+          }));
 
   // 绑定蓝牙管理员
   Future<Response> bindingBlueAdmin(
@@ -346,8 +344,7 @@ class ApiProvider extends BaseProvider {
             'operatorUid': operatorUid,
             'startDate': startDate,
             'timezoneRawOffSet': timezoneRawOffSet
-          }),
-          isShowLoading: true);
+          }));
 
   Future<Response> addKeyboardPwd(
     String lockId,
@@ -403,8 +400,7 @@ class ApiProvider extends BaseProvider {
       jsonEncode({'lockId': lockId, 'groupId': groupId}));
 
   Future<Response> lockGroupList(String type) =>
-      post(lockGroupListURL.toUrl, jsonEncode({'type': type}),
-          isShowLoading: true);
+      post(lockGroupListURL.toUrl, jsonEncode({'type': type}));
 
   Future<Response> deleteElectronicKey(String keyId) =>
       post(deleteElectronicKeyURL.toUrl, jsonEncode({'keyId': keyId}));
@@ -828,26 +824,22 @@ class ApiProvider extends BaseProvider {
       jsonEncode({'type': type, 'keyGroupId': keyGroupId}));
 
   Future<Response> getKeyDetail(String lockId) =>
-      post(getKeyDetailURL.toUrl, jsonEncode({'lockId': lockId}),
-          isShowLoading: true);
+      post(getKeyDetailURL.toUrl, jsonEncode({'lockId': lockId}));
 
   Future<Response> lockUserList(
           String pageNo, String pageSize, String searchStr) =>
       post(
           lockUserListURL.toUrl,
           jsonEncode(
-              {'pageNo': pageNo, 'pageSize': pageSize, 'searchStr': searchStr}),
-          isShowLoading: true);
+              {'pageNo': pageNo, 'pageSize': pageSize, 'searchStr': searchStr}));
 
   Future<Response> keyListByUser(String pageNo, String pageSize, String uid) =>
       post(keyListByUserURL.toUrl,
-          jsonEncode({'pageNo': pageNo, 'pageSize': pageSize, 'uid': uid}),
-          isShowLoading: true);
+          jsonEncode({'pageNo': pageNo, 'pageSize': pageSize, 'uid': uid}));
 
   Future<Response> authorizedAdminList(String pageNo, String pageSize) => post(
       authorizedAdminListURL.toUrl,
-      jsonEncode({'pageNo': pageNo, 'pageSize': pageSize}),
-      isShowLoading: true);
+      jsonEncode({'pageNo': pageNo, 'pageSize': pageSize}));
 
   Future<Response> canSendKey(
           String endDate, List keyGroupIdList, List lockIdList) =>
diff --git a/star_lock/lib/network/api_repository.dart b/star_lock/lib/network/api_repository.dart
index 1c6da3cd..2f3f776c 100644
--- a/star_lock/lib/network/api_repository.dart
+++ b/star_lock/lib/network/api_repository.dart
@@ -756,14 +756,6 @@ class ApiRepository {
     final res =
     await apiProvider.getStaffListData(companyId, lockId);
     return CheckingInAddStaffListEntity.fromJson(res.body);
-
-  // 获取员工
-  Future<LoginEntity> getStaffListData({
-    required String companyId,
-    required String lockId,
-  }) async {
-    final res = await apiProvider.getStaffListData(companyId, lockId);
-    return LoginEntity.fromJson(res.body);
   }
 
   // 添加员工