v0.1.5+1

android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -35,7 +35,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.thl.flutterwanandroid"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

lib/blocs/com_list_bloc.dart

@@ -81,7 +81,7 @@ class ComListBloc implements BlocBase {
       _comListEventSink.add(new StatusEvent(labelId,
           ObjectUtil.isEmpty(list) ? RefreshStatus.noMore : RefreshStatus.idle,
           cid: cid));
-    }).catchError(() {
+    }).catchError((_) {
       _comListPage--;
       _comListEventSink.add(new StatusEvent(labelId, RefreshStatus.failed));
     });
@@ -98,7 +98,7 @@ class ComListBloc implements BlocBase {
       _comListEventSink.add(new StatusEvent(labelId,
           ObjectUtil.isEmpty(list) ? RefreshStatus.noMore : RefreshStatus.idle,
           cid: cid));
-    }).catchError(() {
+    }).catchError((_) {
       _comListPage--;
       _comListEventSink.add(new StatusEvent(labelId, RefreshStatus.failed));
     });
@@ -118,7 +118,7 @@ class ComListBloc implements BlocBase {
       _comListEventSink.add(new StatusEvent(labelId,
           ObjectUtil.isEmpty(list) ? RefreshStatus.noMore : RefreshStatus.idle,
           cid: cid));
-    }).catchError(() {
+    }).catchError((_) {
       _comListPage--;
       _comListEventSink.add(new StatusEvent(labelId, RefreshStatus.failed));
     });

lib/blocs/main_bloc.dart

@@ -236,7 +236,7 @@ class MainBloc implements BlocBase {
           ObjectUtil.isEmpty(list)
               ? RefreshStatus.noMore
               : RefreshStatus.idle));
-    }).catchError(() {
+    }).catchError((_) {
       _reposPage--;
       _homeEventSink.add(new StatusEvent(labelId, RefreshStatus.failed));
     });
@@ -257,7 +257,7 @@ class MainBloc implements BlocBase {
           ObjectUtil.isEmpty(list)
               ? RefreshStatus.noMore
               : RefreshStatus.idle));
-    }).catchError(() {
+    }).catchError((_) {
       _eventsPage--;
       _homeEventSink.add(new StatusEvent(labelId, RefreshStatus.failed));
     });
@@ -287,7 +287,7 @@ class MainBloc implements BlocBase {
           ObjectUtil.isEmpty(list)
               ? RefreshStatus.noMore
               : RefreshStatus.idle));
-    }).catchError(() {
+    }).catchError((_) {
       _homeEventSink.add(new StatusEvent(labelId, RefreshStatus.failed));
     });
   }
@@ -315,7 +315,7 @@ class MainBloc implements BlocBase {
           ObjectUtil.isEmpty(list)
               ? RefreshStatus.noMore
               : RefreshStatus.idle));
-    }).catchError(() {
+    }).catchError((_) {
       _homeEventSink.add(new StatusEvent(labelId, RefreshStatus.failed));
     });
   }

lib/blocs/tab_bloc.dart

@@ -79,7 +79,7 @@ class TabBloc implements BlocBase {
 //          ObjectUtil.isEmpty(list)
 //              ? RefreshStatus.noMore
 //              : RefreshStatus.idle));
-    }).catchError(() {
+    }).catchError((_) {
 //      _homeEventSink.add(new StatusEvent(labelId, RefreshStatus.failed));
     });
   }

lib/ui/pages/home_page.dart

@@ -30,8 +30,8 @@ class HomePage extends StatelessWidget {
             child: new CachedNetworkImage(
               fit: BoxFit.fill,
               imageUrl: model.imagePath,
-              placeholder: new ProgressView(),
-              errorWidget: new Icon(Icons.error),
+              placeholder: (context, url) => new ProgressView(),
+              errorWidget: (context, url, error) => new Icon(Icons.error),
             ),
           );
         }).toList(),

lib/ui/pages/rec_hot_page.dart

@@ -23,8 +23,8 @@ class RecHotPage extends StatelessWidget {
         height: 128,
         fit: BoxFit.fill,
         imageUrl: imgUrl,
-        placeholder: new ProgressView(),
-        errorWidget: new Icon(Icons.error),
+        placeholder: (context, url) => new ProgressView(),
+        errorWidget: (context, url, error) => new Icon(Icons.error),
       ),
     );
   }

lib/ui/pages/splash_page.dart

@@ -180,8 +180,8 @@ class SplashPageState extends State<SplashPage> {
             height: double.infinity,
             fit: BoxFit.fill,
             imageUrl: _splashModel.imgUrl,
-            placeholder: _buildSplashBg(),
-            errorWidget: _buildSplashBg(),
+            placeholder: (context, url) => _buildSplashBg(),
+            errorWidget: (context, url, error) => _buildSplashBg(),
           ),
         ),
       ),

lib/ui/widgets/refresh_scaffold.dart

@@ -78,7 +78,7 @@ class RefreshScaffoldState extends State<RefreshScaffold>
   @override
   Widget build(BuildContext context) {
 //    LogUtil.e("RefreshScaffold build...... " + widget.labelId);
-
+    super.build(context);
     return new Scaffold(
         body: new Stack(
           children: <Widget>[

lib/ui/widgets/repos_item.dart

@@ -69,8 +69,8 @@ class ReposItem extends StatelessWidget {
                   height: 128,
                   fit: BoxFit.fill,
                   imageUrl: model.envelopePic,
-                  placeholder: new ProgressView(),
-                  errorWidget: new Icon(Icons.error),
+                  placeholder: (context, url) => new ProgressView(),
+                  errorWidget: (context, url, error) => new Icon(Icons.error),
                 ),
               )
             ],

pubspec.yaml

@@ -7,10 +7,10 @@ description: Flutter Wanandroid App.
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # Read more about versioning at semver.org.
-version: 0.1.5
+version: 0.1.5+1
 
 environment:
-  sdk: ">=1.19.0 <3.0.0"
+  sdk: ">=2.1.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -24,9 +24,9 @@ dependencies:
   # 汉字转拼音库 https://github.com/flutterchina/lpinyin
   lpinyin: ^1.0.7
   # Dart 常用工具类库 https://github.com/Sky24n/common_utils
-  common_utils: ^1.0.9
+  common_utils: ^1.1.1
   # Flutter 常用工具类库 https://github.com/Sky24n/flustars
-  flustars: ^0.2.4
+  flustars: ^0.2.5
   # Flutter 国际化/多语言库 https://github.com/Sky24n/fluintl
   fluintl: ^0.1.2
   # Flutter 城市列表 https://github.com/flutterchina/azlistview
@@ -36,17 +36,17 @@ dependencies:
   # https://github.com/flutterchina/dio
   dio: ^1.0.13
   # rxdart https://github.com/ReactiveX/rxdart
-  rxdart: ^0.18.1
+  rxdart: ^0.21.0
   # https://github.com/renefloor/flutter_cached_network_image
-  cached_network_image: ^0.5.0
+  cached_network_image: ^0.7.0
   # https://github.com/flutter/plugins/tree/master/packages/url_launcher
-  url_launcher: ^4.0.1
+  url_launcher: ^5.0.2
   # https://github.com/peng8350/flutter_pulltorefresh
   pull_to_refresh: ^1.1.6
   # device_info
-  device_info: ^0.3.0
+  device_info: ^0.4.0+1
   # webview_flutter
-  webview_flutter: ^0.3.3+1
+  webview_flutter: ^0.3.4
   # https://github.com/flutterchina/flukit.
   flukit: ^1.0.0