升级库版本

升级Flutter SKD 到 1.6.0
修复编译错误
修复关注显示错误问题

Author: CarGuo

ios/Podfile.lock

@@ -24,7 +24,7 @@ PODS:
     - Flutter
   - path_provider (0.0.1):
     - Flutter
-  - permission_handler (3.0.0):
+  - permission_handler (3.0.2):
     - Flutter
   - Reachability (3.2)
   - share (0.5.2):
@@ -110,7 +110,7 @@ SPEC CHECKSUMS:
   lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
   package_info: 78cabb3c322943c55d39676f4a5bfc748c01d055
   path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
-  permission_handler: 047f11d44db785922214783da5f7a3cc8874c843
+  permission_handler: 73cfc10e081c379c1dcc19cd0040c77e500fa936
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   share: 7d22fe8baedfe93aefd864bf0b73f29711fbb0a3
   shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523

ios/Runner.xcodeproj/project.pbxproj

@@ -546,7 +546,6 @@
 				"${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
 				"${BUILT_PRODUCTS_DIR}/package_info/package_info.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
-				"${BUILT_PRODUCTS_DIR}/permission_handler/permission_handler.framework",
 				"${BUILT_PRODUCTS_DIR}/share/share.framework",
 				"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
 				"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
@@ -568,7 +567,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/permission_handler.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",

lib/common/net/api.dart

@@ -50,10 +50,7 @@ class HttpManager {
       option.headers = headers;
     }
 
-    Response response;
-    try {
-      response = await _dio.request(url, data: params, options: option);
-    } on DioError catch (e) {
+    resultError(DioError e) {
       Response errorResponse;
       if (e.response != null) {
         errorResponse = e.response;
@@ -65,6 +62,16 @@ class HttpManager {
       }
       return new ResultData(Code.errorHandleFunction(errorResponse.statusCode, e.message, noTip), false, errorResponse.statusCode);
     }
+
+    Response response;
+    try {
+      response = await _dio.request(url, data: params, options: option);
+    } on DioError catch (e) {
+      return resultError(e);
+    }
+    if(response.data is DioError) {
+      return resultError(response.data);
+    }
     return response.data;
   }
 

lib/common/redux/user_redux.dart

@@ -53,10 +53,10 @@ class UserInfoEpic implements EpicClass<GSYState> {
   @override
   Stream<dynamic> call(Stream<dynamic> actions, EpicStore<GSYState> store) {
     return Observable(actions)
-    // to UpdateUserAction actions
+        // to UpdateUserAction actions
         .ofType(TypeToken<FetchUserAction>())
-    // Don't start  until the 10ms
-        .debounce(new Duration(milliseconds: 10))
+        // Don't start  until the 10ms
+        .debounce(((_) => TimerStream(true, const Duration(milliseconds: 10))))
         .switchMap((action) => _loadUserInfo());
   }
 

lib/page/notify_page.dart

@@ -24,7 +24,8 @@ class NotifyPage extends StatefulWidget {
   _NotifyPageState createState() => _NotifyPageState();
 }
 
-class _NotifyPageState extends State<NotifyPage> with AutomaticKeepAliveClientMixin<NotifyPage>, GSYListState<NotifyPage> {
+class _NotifyPageState extends State<NotifyPage>
+    with AutomaticKeepAliveClientMixin<NotifyPage>, GSYListState<NotifyPage> {
   final SlidableController slidableController = new SlidableController();
 
   int selectIndex = 0;
@@ -37,17 +38,23 @@ class _NotifyPageState extends State<NotifyPage> with AutomaticKeepAliveClientMi
       return _renderEventItem(notification);
     }
     return new Slidable(
+      key: ValueKey<String>(index.toString() + "_" + selectIndex.toString()),
       controller: slidableController,
-      delegate: new SlidableDrawerDelegate(),
+      actionPane: SlidableBehindActionPane(),
       actionExtentRatio: 0.25,
       child: _renderEventItem(notification),
+      dismissal: SlidableDismissal(
+        child: SlidableDrawerDismissal(),
+        onDismissed: (actionType) {},
+      ),
       secondaryActions: <Widget>[
         new IconSlideAction(
           caption: CommonUtils.getLocale(context).notify_readed,
           color: Colors.redAccent,
           icon: Icons.delete,
           onTap: () {
-            UserDao.setNotificationAsReadDao(notification.id.toString()).then((res) {
+            UserDao.setNotificationAsReadDao(notification.id.toString())
+                .then((res) {
               showRefreshLoading();
             });
           },
@@ -57,7 +64,8 @@ class _NotifyPageState extends State<NotifyPage> with AutomaticKeepAliveClientMi
   }
 
   _renderEventItem(Model.Notification notification) {
-    EventViewModel eventViewModel = EventViewModel.fromNotify(context, notification);
+    EventViewModel eventViewModel =
+        EventViewModel.fromNotify(context, notification);
     return new EventItem(eventViewModel, onPressed: () {
       if (notification.unread) {
         UserDao.setNotificationAsReadDao(notification.id.toString());
@@ -68,7 +76,9 @@ class _NotifyPageState extends State<NotifyPage> with AutomaticKeepAliveClientMi
         String number = tmp[tmp.length - 1];
         String userName = notification.repository.owner.login;
         String reposName = notification.repository.name;
-        NavigatorUtils.goIssueDetail(context, userName, reposName, number, needRightLocalIcon: true).then((res) {
+        NavigatorUtils.goIssueDetail(context, userName, reposName, number,
+                needRightLocalIcon: true)
+            .then((res) {
           showRefreshLoading();
         });
       }

lib/widget/network_cache_image.dart

@@ -38,9 +38,9 @@ class NetworkCacheImage extends ImageProvider<NetworkCacheImage> {
     return MultiFrameImageStreamCompleter(
       codec: _loadAsync(key),
       scale: key.scale,
-      informationCollector: (StringBuffer information) {
-        information.writeln('Image provider: $this');
-        information.write('Image key: $key');
+      informationCollector: () sync* {
+        yield DiagnosticsProperty<ImageProvider>('Image provider', this);
+        yield DiagnosticsProperty<NetworkCacheImage>('Image key', key);
       },
     );
   }

pubspec.lock

@@ -175,7 +175,7 @@ packages:
       name: dio
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   event_bus:
     dependency: "direct main"
     description:
@@ -236,7 +236,7 @@ packages:
       name: flutter_slidable
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.9"
+    version: "0.5.0"
   flutter_spinkit:
     dependency: "direct main"
     description:
@@ -257,14 +257,14 @@ packages:
       name: flutter_svg
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.4"
+    version: "0.13.0+1"
   flutter_webview_plugin:
     dependency: "direct main"
     description:
       name: flutter_webview_plugin
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.4"
+    version: "0.3.5"
   fluttertoast:
     dependency: "direct main"
     description:
@@ -348,14 +348,14 @@ packages:
       name: json_annotation
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.0"
+    version: "2.4.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.2"
+    version: "3.0.0"
   kernel:
     dependency: transitive
     description:
@@ -432,14 +432,14 @@ packages:
       name: path_drawing
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.0"
+    version: "0.4.1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.4"
   path_provider:
     dependency: "direct main"
     description:
@@ -460,7 +460,7 @@ packages:
       name: permission_handler
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.2"
   petitparser:
     dependency: transitive
     description:
@@ -471,10 +471,12 @@ packages:
   photo_view:
     dependency: "direct main"
     description:
-      name: photo_view
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.2.5"
+      path: "."
+      ref: "1fc0effdb8269f4f6bb61186acb127890002b770"
+      resolved-ref: "1fc0effdb8269f4f6bb61186acb127890002b770"
+      url: "https://github.com/CarSmallGuo/photo_view.git"
+    source: git
+    version: "0.3.3"
   platform:
     dependency: transitive
     description:
@@ -523,7 +525,7 @@ packages:
       name: rxdart
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.21.0"
+    version: "0.22.0"
   scoped_model:
     dependency: "direct main"
     description:
@@ -682,7 +684,7 @@ packages:
       name: webview_flutter
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.6"
+    version: "0.3.7+1"
   xml:
     dependency: transitive
     description:
@@ -699,4 +701,4 @@ packages:
     version: "2.1.15"
 sdks:
   dart: ">=2.3.0-dev.0.1 <3.0.0"
-  flutter: ">=1.2.1 <2.0.0"
+  flutter: ">=1.5.9-pre.94 <2.0.0"

pubspec.yaml

@@ -10,41 +10,44 @@ dependencies:
   cupertino_icons: ^0.1.2
   shared_preferences: ^0.5.1+1
   fluttertoast: ^3.0.1
-  json_annotation: ^2.0.0
+  json_annotation: ^2.4.0
   flutter_redux: ^0.5.3
   device_info: ^0.4.0+1
-  connectivity: ^0.4.2
-  url_launcher: ^5.0.1
+  connectivity: ^0.4.3+1
+  url_launcher: ^5.0.2
   flutter_markdown: ^0.2.0
   share: ^0.6.0+1
   flutter_spinkit: ^3.1.0
-  flutter_webview_plugin: ^0.3.4
+  flutter_webview_plugin: ^0.3.5
   sqflite: ^1.1.5
   pub_semver: ^1.4.2
   flutter_statusbar: ^0.0.1
-  flutter_svg: ^0.12.4
-  photo_view: ^0.2.1
-  flutter_slidable: ^0.4.9
-  dio: ^2.1.2
-  flutter_localizations:
-    sdk: flutter
+  flutter_svg: ^0.13.0+1
+  flutter_slidable: ^0.5.0
+  dio: ^2.1.4
   event_bus:  ^1.1.0
   flutter_cache_manager: ^0.3.2
   path_provider: ^0.5.0+1
-  permission_handler: 3.0.0
+  permission_handler: 3.0.2
   scoped_model: ^1.0.1
-  package_info: ^0.4.0+1
-  rxdart: ^0.21.0
+  package_info: ^0.4.0+3
+  rxdart: ^0.22.0
   android_intent: ^0.3.0
-  webview_flutter: ^0.3.6
+  webview_flutter: ^0.3.7+1
+  flutter_localizations:
+    sdk: flutter
   flutter_lottie:
     git:
       url: https://github.com/CarSmallGuo/flutter_lottie.git
       ref: a59dffd8282746de1c0e463ae12bbd737205aec1
+  photo_view:
+    git:
+      url: https://github.com/CarSmallGuo/photo_view.git
+      ref: 1fc0effdb8269f4f6bb61186acb127890002b770
 
 dev_dependencies:
   build_runner: ^1.2.8
-  json_serializable: ^2.0.0
+  json_serializable: ^3.0.0
 #  flutter_test:
 #    sdk: flutter