Browse Source

[modify]修改待办事项分页方式

zk 1 year ago
parent
commit
7b10f0a9a4

+ 5 - 5
lib/data/api/request/agenda_request.dart

@@ -5,10 +5,10 @@ part 'agenda_request.g.dart';
 
 
 @JsonSerializable()
 @JsonSerializable()
 class AgendaRequest extends AppBaseRequest {
 class AgendaRequest extends AppBaseRequest {
-  @JsonKey(name: 'page')
-  final int page;
-  @JsonKey(name: 'pageSize')
-  final int pageSize;
+  @JsonKey(name: 'offset')
+  final int offset;
+  @JsonKey(name: 'limit')
+  final int limit;
   @JsonKey(name: 'startTime')
   @JsonKey(name: 'startTime')
   int? startTime;
   int? startTime;
   @JsonKey(name: 'endTime')
   @JsonKey(name: 'endTime')
@@ -16,7 +16,7 @@ class AgendaRequest extends AppBaseRequest {
   @JsonKey(name: 'completeStatus')
   @JsonKey(name: 'completeStatus')
   String? completeStatus;
   String? completeStatus;
 
 
-  AgendaRequest(this.page, this.pageSize,
+  AgendaRequest(this.offset, this.limit,
       {this.startTime, this.endTime, this.completeStatus});
       {this.startTime, this.endTime, this.completeStatus});
 
 
   @override
   @override

+ 9 - 9
lib/data/repositories/agenda_repository.dart

@@ -36,16 +36,16 @@ class AgendaRepository {
   }
   }
 
 
   Future<AgendaResponse> requestHomeAgendaData(
   Future<AgendaResponse> requestHomeAgendaData(
-      {int pageSize = 999, TaskStatus completeStatus = TaskStatus.TODO}) {
-    return requestAgendaPagePaginate(1, pageSize,
-        completeStatus: completeStatus);
+      {TaskStatus completeStatus = TaskStatus.TODO}) {
+    return requestAgendaPagePaginate(0, 10,
+        completeStatus: completeStatus, isClearAll: true);
   }
   }
 
 
-  Future<AgendaResponse> requestAgendaPagePaginate(int page, int pageSize,
-      {TaskStatus? completeStatus}) {
-    return agendaPage(page, pageSize, completeStatus: completeStatus)
+  Future<AgendaResponse> requestAgendaPagePaginate(int offset, int limit,
+      {TaskStatus? completeStatus, bool? isClearAll}) {
+    return agendaPage(offset, limit, completeStatus: completeStatus)
         .then((response) {
         .then((response) {
-      if (page == 1) {
+      if (isClearAll == true) {
         _agendaList.clear();
         _agendaList.clear();
       }
       }
       if (response.list != null) {
       if (response.list != null) {
@@ -55,10 +55,10 @@ class AgendaRepository {
     });
     });
   }
   }
 
 
-  Future<AgendaResponse> agendaPage(int page, int pageSize,
+  Future<AgendaResponse> agendaPage(int offset, int limit,
       {int? startTime, int? endTime, TaskStatus? completeStatus}) {
       {int? startTime, int? endTime, TaskStatus? completeStatus}) {
     return atmobApi
     return atmobApi
-        .agendaPage(AgendaRequest(page, pageSize,
+        .agendaPage(AgendaRequest(offset, limit,
             startTime: startTime,
             startTime: startTime,
             endTime: endTime,
             endTime: endTime,
             completeStatus: completeStatus?.value))
             completeStatus: completeStatus?.value))

+ 0 - 1
lib/data/repositories/task_repository.dart

@@ -6,7 +6,6 @@ import 'package:electronic_assistant/data/repositories/agenda_repository.dart';
 import 'package:electronic_assistant/data/repositories/talk_repository.dart';
 import 'package:electronic_assistant/data/repositories/talk_repository.dart';
 import 'package:electronic_assistant/utils/async_util.dart';
 import 'package:electronic_assistant/utils/async_util.dart';
 import 'package:electronic_assistant/utils/cancel_future.dart';
 import 'package:electronic_assistant/utils/cancel_future.dart';
-import 'package:electronic_assistant/utils/toast_util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/cupertino.dart';
 import '../../dialog/analyse_status_dialog.dart';
 import '../../dialog/analyse_status_dialog.dart';
 import '../../module/talk/view.dart';
 import '../../module/talk/view.dart';