调整bloc

Author: CarGuo

ios/Podfile.lock

@@ -34,7 +34,7 @@ PODS:
 DEPENDENCIES:
   - connectivity (from `.symlinks/plugins/connectivity/ios`)
   - device_info (from `.symlinks/plugins/device_info/ios`)
-  - Flutter (from `.symlinks/flutter/ios-release`)
+  - Flutter (from `.symlinks/flutter/ios`)
   - flutter_statusbar (from `.symlinks/plugins/flutter_statusbar/ios`)
   - flutter_webview_plugin (from `.symlinks/plugins/flutter_webview_plugin/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
@@ -57,7 +57,7 @@ EXTERNAL SOURCES:
   device_info:
     :path: ".symlinks/plugins/device_info/ios"
   Flutter:
-    :path: ".symlinks/flutter/ios-release"
+    :path: ".symlinks/flutter/ios"
   flutter_statusbar:
     :path: ".symlinks/plugins/flutter_statusbar/ios"
   flutter_webview_plugin:

lib/bloc/base/base_bloc.dart

@@ -62,7 +62,6 @@ abstract class BlocListBase extends BlocBase {
   @override
   void initState() {
     _isShow = true;
-    pullLoadWidgetControl.dispose();
   }
 
   @mustCallSuper
@@ -87,15 +86,6 @@ abstract class BlocListBase extends BlocBase {
     return (res != null && res.data != null && res.data.length == Config.PAGE_SIZE);
   }
 
-  @protected
-  resolveRefreshResult(res) {
-    if (res != null && res.result) {
-      if (_isShow) {
-        refreshData(res.data);
-      }
-    }
-  }
-
   int get page => _page;
 
   ///列表数据长度
@@ -117,16 +107,16 @@ abstract class BlocListBase extends BlocBase {
   get dataList => pullLoadWidgetControl.dataList;
 
   ///刷新列表数据
-  refreshData(List listData) {
-    if (pullLoadWidgetControl.dataList != null) {
-      pullLoadWidgetControl.dataList = listData;
+  refreshData(res) {
+    if (res != null) {
+      pullLoadWidgetControl.dataList = res.data;
     }
   }
 
   ///加载更多数据
-  loadMoreData(List listData) {
-    if (listData != null) {
-      pullLoadWidgetControl.addList(listData);
+  loadMoreData(res) {
+    if (res != null) {
+      pullLoadWidgetControl.addList(res.data);
     }
   }
 

lib/bloc/dynamic_bloc.dart

@@ -10,13 +10,15 @@ class DynamicBloc extends BlocListBase {
     pageReset();
     var res = await EventDao.getEventReceived(userName, page: page, needDb: true);
     changeLoadMoreStatus(getLoadMoreStatus(res));
+    refreshData(res);
     return res;
   }
 
   requestLoadMore(String userName) async {
     pageUp();
     var res = await EventDao.getEventReceived(userName, page: page);
     changeLoadMoreStatus(getLoadMoreStatus(res));
+    loadMoreData(res);
     return res;
   }
 

lib/bloc/trend_bloc.dart

@@ -10,6 +10,7 @@ class TrendBloc extends BlocListBase {
     pageReset();
     var res = await ReposDao.getTrendDao(since: selectTime.value, languageType: selectType.value);
     changeLoadMoreStatus(getLoadMoreStatus(res));
+    refreshData(res);
     return res;
   }
 }

lib/widget/gsy_bloc_list_state.dart

@@ -23,11 +23,11 @@ mixin GSYListState<T extends StatefulWidget> on State<T>, AutomaticKeepAliveClie
 
   ///下拉刷新数据
   @protected
-  requestRefresh();
+  Future requestRefresh();
 
   ///上拉更多请求数据
   @protected
-  requestLoadMore();
+  Future requestLoadMore();
 
   ///是否需要第一次进入自动刷新
   @protected