From f7b4b3926396f8f6251a1ccd47a519be8a876d7b 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, 29 Apr 2024 16:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E8=93=9D?=
 =?UTF-8?q?=E7=89=99=E6=9F=A5=E8=AF=A2=2010=E6=9D=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_lock/ios/Podfile.lock                                  | 2 +-
 .../lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart  | 6 +++---
 .../lib/main/lockDetail/doorLockLog/doorLockLog_state.dart  | 1 +
 .../lib/main/lockDetail/lockDetail/lockDetail_logic.dart    | 4 ++--
 .../lib/main/lockDetail/lockDetail/lockDetail_state.dart    | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/star_lock/ios/Podfile.lock b/star_lock/ios/Podfile.lock
index c1b43709..e962a17c 100644
--- a/star_lock/ios/Podfile.lock
+++ b/star_lock/ios/Podfile.lock
@@ -316,7 +316,7 @@ SPEC CHECKSUMS:
   flutter_native_contact_picker: bd430ba0fbf82768bb50c2c52a69a65759a8f907
   flutter_pcm_sound: de0572ca4f99091cc2abfcc31601b8a4ddd33c0e
   flutter_voice_processor: 2b89b93d69b02227ae3fd58589ee0bcfa3ca2a82
-  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
+  fluttertoast: 9f2f8e81bb5ce18facb9748d7855bf5a756fe3db
   fluwx: daa284756ce53442b3d0417ceeda66e981906811
   google_maps_flutter_ios: d1318b4ff711612cab16862d7a87e31a7403d458
   GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4
diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
index 2b6df480..970a4300 100644
--- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
+++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
@@ -97,7 +97,7 @@ class DoorLockLogLogic extends BaseGetXController {
           }
           lockRecordUploadData(uploadList);
 
-          if(dataLength == 20){
+          if(dataLength == state.logCountPage){
             state.ifHaveNext = true;
           }
         }
@@ -179,7 +179,7 @@ class DoorLockLogLogic extends BaseGetXController {
         IoSenderManage.senderReferEventRecordTimeCommand(
           keyID: BlueManage().connectDeviceName,
           userID: await Storage.getUid(),
-          logsCount: int.parse(pageSize),
+          logsCount: state.logCountPage,
           // time:DateTime.now().millisecondsSinceEpoch~/1000,
           time: state.operateDate,
           token: getTokenList,
@@ -203,7 +203,7 @@ class DoorLockLogLogic extends BaseGetXController {
         lockId: state.keyInfos.value.lockId!,
         lockEventType: state.dropdownValue.value,
         pageNo: 1,
-        pageSize: 20,
+        pageSize: int.parse(pageSize),
         startDate: state.startDate.value,
         endDate: state.endDate.value);
 
diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_state.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_state.dart
index 8b560b73..5edae651 100644
--- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_state.dart
+++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_state.dart
@@ -49,6 +49,7 @@ class DoorLockLogState {
   var ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示
   var operateDate = 0; // 按日期查询消息记录的时间戳
   var ifHaveNext = false; // 页码
+  var logCountPage = 10; // 蓝牙记录一页多少个
 
   DoorLockLogState() {
     keyInfos.value = Get.arguments["keyInfo"];
diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
index 77d0ba76..b8b88f52 100644
--- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
+++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
@@ -191,7 +191,7 @@ class LockDetailLogic extends BaseGetXController {
           }
           lockRecordUploadData(uploadList);
 
-          if(dataLength == 20){
+          if(dataLength == state.logCountPage){
             senderReferEventRecordTime();
           }else{
             await BlueManage().disconnect();
@@ -383,7 +383,7 @@ class LockDetailLogic extends BaseGetXController {
         IoSenderManage.senderReferEventRecordTimeCommand(
           keyID: BlueManage().connectDeviceName,
           userID: await Storage.getUid(),
-          logsCount: 20,
+          logsCount: state.logCountPage,
           // time:DateTime.now().millisecondsSinceEpoch~/1000,
           time: state.operateDate,
           token: getTokenList,
diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_state.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_state.dart
index 78b6b4c5..7b4c95dc 100644
--- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_state.dart
+++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_state.dart
@@ -47,7 +47,7 @@ class LockDetailState {
   var currentPage = 0.obs;
 
   var operateDate = 0; // 按日期查询消息记录的时间戳
-
+  var logCountPage = 10; // 蓝牙记录一页多少个
   // LockDetailState() {
   //   Map map = Get.arguments;
   //   lockCount = map["lockCount"];