修复一些bug,升级第三方插件

Author: shichunlei

README.md

@@ -40,28 +40,28 @@
 ## 运行环境
 
 ```
-[✓] Flutter (Channel beta, v1.17.0, on Mac OS X 10.14.6 18G103, locale zh-Hans-CN)
-    • Flutter version 1.17.0 at /Users/14cells/Android/flutter
-    • Framework revision e6b34c2b5c (2 weeks ago), 2020-05-02 11:39:18 -0700
-    • Engine revision 540786dd51
-    • Dart version 2.8.1
+[✓] Flutter (Channel stable, v1.17.5, on Mac OS X 10.15.4 19E287, locale zh-Hans-CN)
+    • Flutter version 1.17.5 at /System/Volumes/Data/workspace/flutter
+    • Framework • revision 8af6b2f038 (2 个月前) • 2020-06-30 12:53:55 -0700
+    • Engine revision ee76268252
+    • Dart version 2.8.4
 
-[✓] Android toolchain - develop for Android devices (Android SDK version 29.0.2)
+[✓] Android toolchain - develop for Android devices (Android SDK version 30.0.2)
     • Android SDK at /Users/14cells/Android/SDK
-    • Platform android-R, build-tools 29.0.2
+    • Platform android-R, build-tools 30.0.2
     • Java binary at: /Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin/java
     • Java version OpenJDK Runtime Environment (build 1.8.0_202-release-1483-b49-5587405)
     • All Android licenses accepted.
 
-[✓] Xcode - develop for iOS and macOS (Xcode 11.2.1)
+[✓] Xcode - develop for iOS and macOS (Xcode 11.7)
     • Xcode at /Applications/Xcode.app/Contents/Developer
-    • Xcode 11.2.1, Build version 11B500
+    • Xcode 11.7, Build version 11B500
     • CocoaPods version 1.8.4
 
 [✓] Chrome - develop for the web
     • Chrome at /Applications/Google Chrome.app/Contents/MacOS/Google Chrome
 
-[✓] Android Studio (version 3.5)
+[✓] Android Studio (version 3.6)
     • Android Studio at /Applications/Android Studio.app/Contents
     • Flutter plugin version 44.0.1
     • Dart plugin version 191.8593

ios/Runner.xcodeproj/project.pbxproj

@@ -362,7 +362,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -443,7 +443,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -491,7 +491,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

ios/Runner/GeneratedPluginRegistrant.m

@@ -76,8 +76,8 @@
 @import foundation_fluttify;
 #endif
 
-#if __has_include(<image_cropper/ImageCropperPlugin.h>)
-#import <image_cropper/ImageCropperPlugin.h>
+#if __has_include(<image_cropper/FLTImageCropperPlugin.h>)
+#import <image_cropper/FLTImageCropperPlugin.h>
 #else
 @import image_cropper;
 #endif

lib/article/db/article_provider.dart

@@ -1,9 +1,8 @@
-import 'package:flutter_app/utils/database.dart';
+import 'dart:async';
+
 import 'package:flutter_app/bean/article.dart';
+import 'package:flutter_app/utils/database.dart';
 import 'package:sqflite/sqflite.dart';
-import 'package:quiver/strings.dart' as strings;
-
-import 'dart:async';
 
 class ArticleProvider extends BaseDBProvider {
   /// DataBase table name
@@ -46,7 +45,7 @@ class ArticleProvider extends BaseDBProvider {
 
   Future<int> insertOrReplaceToDB(Article article) async {
     String date = article?.curr;
-    if (article == null || strings.isEmpty(date) == null) return null;
+    if (article == null || date.isEmpty) return null;
     Database db = await getDB();
     bool provider = await isCollection(date);
     Map<String, dynamic> map = article.toMap();

lib/baixing_life/db/goods_provider.dart

@@ -1,7 +1,6 @@
 import 'package:flutter_app/bean/baixing.dart';
 import 'package:flutter_app/utils/database.dart';
 import 'package:sqflite/sqflite.dart';
-import 'package:quiver/strings.dart' as strings;
 
 class GoodsProvider extends BaseDBProvider {
   /// DataBase table name
@@ -80,7 +79,7 @@ class GoodsProvider extends BaseDBProvider {
 
   Future<int> insertOrReplaceToDB(Goods goods) async {
     String goodsId = goods?.goodsId;
-    if (goods == null || strings.isEmpty(goodsId) == null) return null;
+    if (goods == null || goodsId.isEmpty) return null;
     Database db = await getDB();
     Map<String, dynamic> map = goods.toMap();
     if (await isExist(goodsId)) {