优化上下拉刷新

CarGuo · CarGuo · commit 02f541673814 · 2019-05-24T21:45:36.000+08:00
diff --git a/lib/page/push_detail_page.dart b/lib/page/push_detail_page.dart
@@ -59,7 +59,7 @@ class _PushDetailPageState extends State<PushDetailPage> with AutomaticKeepAlive
         setState(() {
           pushHeaderViewModel = PushHeaderViewModel.forMap(pushCommit);
           pullLoadWidgetControl.dataList.addAll(pushCommit.files);
-          pullLoadWidgetControl.needLoadMore = false;
+          pullLoadWidgetControl.needLoadMore.value = false;
           titleOptionControl.url = pushCommit.htmlUrl;
         });
       }
diff --git a/lib/widget/gsy_list_state.dart b/lib/widget/gsy_list_state.dart
@@ -16,12 +16,30 @@ mixin GSYListState<T extends StatefulWidget> on State<T>, AutomaticKeepAliveClie
 
   int page = 1;
 
+  bool isRefreshing = false;
+
+  bool isLoadMoring = false;
+
   final List dataList = new List();
 
   final GSYPullLoadWidgetControl pullLoadWidgetControl = new GSYPullLoadWidgetControl();
 
   final GlobalKey<RefreshIndicatorState> refreshIndicatorKey = new GlobalKey<RefreshIndicatorState>();
 
+  _lockToAwait() async {
+    ///if loading, lock to await
+    doDelayed() async {
+      await Future.delayed(Duration(seconds: 1)).then((_) async {
+        if (isLoading) {
+          return await doDelayed();
+        } else {
+          return null;
+        }
+      });
+    }
+    await doDelayed();
+  }
+
   showRefreshLoading() {
     new Future.delayed(const Duration(seconds: 0), () {
       refreshIndicatorKey.currentState.show().then((e) {});
@@ -44,9 +62,13 @@ mixin GSYListState<T extends StatefulWidget> on State<T>, AutomaticKeepAliveClie
   @protected
   Future<Null> handleRefresh() async {
     if (isLoading) {
-      return null;
+      if(isRefreshing) {
+        return null;
+      }
+      await _lockToAwait();
     }
     isLoading = true;
+    isRefreshing = true;
     page = 1;
     var res = await requestRefresh();
     resolveRefreshResult(res);
@@ -57,15 +79,20 @@ mixin GSYListState<T extends StatefulWidget> on State<T>, AutomaticKeepAliveClie
       resolveDataResult(resNext);
     }
     isLoading = false;
+    isRefreshing = false;
     return null;
   }
 
   @protected
   Future<Null> onLoadMore() async {
     if (isLoading) {
-      return null;
+      if(isLoadMoring) {
+        return null;
+      }
+      await _lockToAwait();
     }
     isLoading = true;
+    isLoadMoring = true;
     page++;
     var res = await requestLoadMore();
     if (res != null && res.result) {
@@ -77,14 +104,15 @@ mixin GSYListState<T extends StatefulWidget> on State<T>, AutomaticKeepAliveClie
     }
     resolveDataResult(res);
     isLoading = false;
+    isLoadMoring = false;
     return null;
   }
 
   @protected
   resolveDataResult(res) {
     if (isShow) {
       setState(() {
-        pullLoadWidgetControl.needLoadMore = (res != null && res.data != null && res.data.length == Config.PAGE_SIZE);
+        pullLoadWidgetControl.needLoadMore.value = (res != null && res.data != null && res.data.length == Config.PAGE_SIZE);
       });
     }
   }
diff --git a/lib/widget/gsy_pull_load_widget.dart b/lib/widget/gsy_pull_load_widget.dart
@@ -42,11 +42,22 @@ class _GSYPullLoadWidgetState extends State<GSYPullLoadWidget> {
 
   @override
   void initState() {
+    this.control.needLoadMore?.addListener((){
+      ///延迟两秒等待确认
+      try {
+        Future.delayed(Duration(seconds: 2), (){
+           // ignore: invalid_use_of_visible_for_testing_member, invalid_use_of_protected_member
+          _scrollController.notifyListeners();
+        });
+      } catch(e) {
+        print(e);
+      }
+    });
     ///增加滑动监听
     _scrollController.addListener(() {
       ///判断当前滑动位置是不是到达底部，触发加载更多回调
       if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent) {
-        if (this.control.needLoadMore) {
+        if (this.control.needLoadMore.value) {
           this.onLoadMore?.call();
         }
       }
@@ -139,7 +150,7 @@ class _GSYPullLoadWidgetState extends State<GSYPullLoadWidget> {
   ///上拉加载更多
   Widget _buildProgressIndicator() {
     ///是否需要显示上拉加载更多的loading
-    Widget bottomWidget = (control.needLoadMore)
+    Widget bottomWidget = (control.needLoadMore.value)
         ? new Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
             ///loading框
             new SpinKitRotatingCircle(color: Theme.of(context).primaryColor),
@@ -174,7 +185,7 @@ class GSYPullLoadWidgetControl {
   List dataList = new List();
 
   ///是否需要加载更多
-  bool needLoadMore = true;
+  ValueNotifier<bool> needLoadMore = new ValueNotifier(false);
 
   ///是否需要头部
   bool needHeader = false;
diff --git a/lib/widget/gsy_pull_new_load_widget.dart b/lib/widget/gsy_pull_new_load_widget.dart
@@ -27,9 +27,12 @@ class GSYPullLoadWidget extends StatefulWidget {
 }
 
 class _GSYPullLoadWidgetState extends State<GSYPullLoadWidget> {
-
   final ScrollController _scrollController = new ScrollController();
 
+  bool isRefreshing = false;
+
+  bool isLoadMoring = false;
+
   @override
   void initState() {
     ///增加滑动监听
@@ -43,6 +46,14 @@ class _GSYPullLoadWidgetState extends State<GSYPullLoadWidget> {
     });
     widget.control.addListener(() {
       setState(() {});
+      try {
+        Future.delayed(Duration(seconds: 2), () {
+          // ignore: invalid_use_of_visible_for_testing_member, invalid_use_of_protected_member
+          _scrollController.notifyListeners();
+        });
+      } catch (e) {
+        print(e);
+      }
     });
     super.initState();
   }
@@ -84,24 +95,53 @@ class _GSYPullLoadWidgetState extends State<GSYPullLoadWidget> {
     }
   }
 
+  _lockToAwait() async {
+    ///if loading, lock to await
+    doDelayed() async {
+      await Future.delayed(Duration(seconds: 1)).then((_) async {
+        if (widget.control.isLoading) {
+          return await doDelayed();
+        } else {
+          return null;
+        }
+      });
+    }
+
+    await doDelayed();
+  }
+
   @protected
   Future<Null> handleRefresh() async {
     if (widget.control.isLoading) {
-      return null;
+      if (isRefreshing) {
+        return null;
+      }
+
+      ///if loading, lock to await
+      await _lockToAwait();
     }
     widget.control.isLoading = true;
+    isRefreshing = true;
     await widget.onRefresh?.call();
+    isRefreshing = false;
     widget.control.isLoading = false;
     return null;
   }
 
   @protected
   Future<Null> handleLoadMore() async {
     if (widget.control.isLoading) {
-      return null;
+      if (isLoadMoring) {
+        return null;
+      }
+
+      ///if loading, lock to await
+      await _lockToAwait();
     }
+    isLoadMoring = true;
     widget.control.isLoading = true;
     await widget.onLoadMore?.call();
+    isLoadMoring = false;
     widget.control.isLoading = false;
     return null;
   }
@@ -192,14 +232,14 @@ class GSYPullLoadWidgetControl extends ChangeNotifier {
 
   set dataList(List value) {
     _dataList.clear();
-    if(value != null) {
+    if (value != null) {
       _dataList.addAll(value);
       notifyListeners();
     }
   }
 
   addList(List value) {
-    if(value != null) {
+    if (value != null) {
       _dataList.addAll(value);
       notifyListeners();
     }
diff --git a/lib/widget/nested/gsy_nested_pull_load_widget.dart b/lib/widget/nested/gsy_nested_pull_load_widget.dart
@@ -116,7 +116,7 @@ class _GSYNestedPullLoadWidgetState extends State<GSYNestedPullLoadWidget> {
           onNotification: (ScrollNotification p){
             if (p.metrics.pixels >=
                 p.metrics.maxScrollExtent) {
-              if (this.control.needLoadMore) {
+              if (this.control.needLoadMore.value) {
                 this.onLoadMore?.call();
               }
             }
@@ -163,7 +163,7 @@ class _GSYNestedPullLoadWidgetState extends State<GSYNestedPullLoadWidget> {
   ///上拉加载更多
   Widget _buildProgressIndicator() {
     ///是否需要显示上拉加载更多的loading
-    Widget bottomWidget = (control.needLoadMore)
+    Widget bottomWidget = (control.needLoadMore.value)
         ? new Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class _PushDetailPageState extends State<PushDetailPage> with AutomaticKeepAlive`
`59`	`59`	`setState(() {`
`60`	`60`	`pushHeaderViewModel = PushHeaderViewModel.forMap(pushCommit);`
`61`	`61`	`pullLoadWidgetControl.dataList.addAll(pushCommit.files);`
`62`		`- pullLoadWidgetControl.needLoadMore = false;`
	`62`	`+ pullLoadWidgetControl.needLoadMore.value = false;`
`63`	`63`	`titleOptionControl.url = pushCommit.htmlUrl;`
`64`	`64`	`});`
`65`	`65`	`}`