Merge pull request #17 from PicGo/dev

pre release v1.9.2+23

Author: hackycy

README.md

@@ -21,7 +21,7 @@ Flutter-PicGo: 一个用于快速上传图片并获取图片URL链接的**手机
 - 七牛云 [v1.3+]
 - 阿里云OSS [v1.4+]
 - 腾讯云COS [v1.5+]
-- 牛图网 [v1.6+]
+- ~~牛图网（已无法使用）~~ [v1.6+]
 - 兰空 [v1.7+]
 - 又拍云 [v1.8+]
 

android/app/build.gradle

@@ -50,6 +50,9 @@ android {
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        
+        // support multidex
+        multiDexEnabled true
     }
 
     signingConfigs {

ios/Podfile.lock

@@ -9,15 +9,15 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - image_picker (0.0.1):
-    - Flutter
   - MTBBarcodeScanner (5.0.11)
   - package_info (0.0.1):
     - Flutter
   - path_provider (0.0.1):
     - Flutter
   - "permission_handler (5.0.1+1)":
     - Flutter
+  - photo_manager (0.0.1):
+    - Flutter
   - shared_preferences (0.0.1):
     - Flutter
   - sqflite (0.0.2):
@@ -26,18 +26,21 @@ PODS:
   - SwiftProtobuf (1.9.0)
   - url_launcher (0.0.1):
     - Flutter
+  - video_player (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
   - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
   - Flutter (from `Flutter`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
-  - image_picker (from `.symlinks/plugins/image_picker/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
+  - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
+  - video_player (from `.symlinks/plugins/video_player/ios`)
 
 SPEC REPOS:
   trunk:
@@ -52,35 +55,38 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
-  image_picker:
-    :path: ".symlinks/plugins/image_picker/ios"
   package_info:
     :path: ".symlinks/plugins/package_info/ios"
   path_provider:
     :path: ".symlinks/plugins/path_provider/ios"
   permission_handler:
     :path: ".symlinks/plugins/permission_handler/ios"
+  photo_manager:
+    :path: ".symlinks/plugins/photo_manager/ios"
   shared_preferences:
     :path: ".symlinks/plugins/shared_preferences/ios"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
   url_launcher:
     :path: ".symlinks/plugins/url_launcher/ios"
+  video_player:
+    :path: ".symlinks/plugins/video_player/ios"
 
 SPEC CHECKSUMS:
   barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
   permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
+  photo_manager: f7c619c2cc8c2adb8d85c63363babac477de9c67
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
   SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
+  video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
 
 PODFILE CHECKSUM: 08e41981fcdc78ff11c898bc59c6c49635c114b3
 

lib/api/tcyun_api.dart

@@ -11,15 +11,14 @@ class TcyunApi {
   static const String secretKey = 'secretKey';
   static const String secretId = 'secretId';
 
-  static Future postObject(String secretId, String secretKey, String bucket, String area, String ext, FormData formData) async {
+  static Future postObject(String secretId, String secretKey, String bucket,
+      String area, String ext, FormData formData) async {
     Response res = await NetUtils.getInstance().post(
-      'https://$bucket.cos.$area.$BASE_URL/',
-      data: formData,
-      options: Options(
-        extra: {TcyunApi.secretId: secretId, TcyunApi.secretKey: secretKey},
-        contentType: 'image/$ext'
-      )
-    );
+        'https://$bucket.cos.$area.$BASE_URL/',
+        data: formData,
+        options: Options(
+            extra: {TcyunApi.secretId: secretId, TcyunApi.secretKey: secretKey},
+            contentType: 'image/$ext'));
     return res.headers;
   }
 
@@ -56,7 +55,7 @@ class TcyunApi {
     /// signkey
     var hmacsha1Signkey = Hmac(sha1, utf8.encode(secretKey));
     var signKey = hmacsha1Signkey.convert(utf8.encode(keyTime));
-    // string to sign 
+    // string to sign
     var stringToSign = sha1.convert(utf8.encode(policy));
     // signature
     var hmacsha1Signature = Hmac(sha1, utf8.encode('$signKey'));
@@ -131,7 +130,6 @@ class TcyunInterceptor extends InterceptorsWrapper {
       }
       if (headers != null) {
         headers.forEach((key, value) {
-          print('key = $key, value = $value');
           headerList += '${Uri.encodeComponent(key).toLowerCase()};';
           httpHeaders +=
               '${Uri.encodeComponent(key).toLowerCase()}=${Uri.encodeComponent(value)}&';

lib/components/manage_item.dart

@@ -1,5 +1,6 @@
-import 'package:cached_network_image/cached_network_image.dart';
+import 'package:extended_image/extended_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_picgo/utils/extended.dart';
 import 'package:path/path.dart';
 
 typedef GestureTapCallback = void Function();
@@ -77,48 +78,23 @@ class ManageItem extends StatelessWidget {
       var imageSuffixs = ['png', 'bmp', 'jpeg', 'gif', 'jpg'];
       if (imageSuffixs.contains(suffix)) {
         return SizedBox(
-          height: 50,
-          width: 50,
-          child: Card(
-            clipBehavior: Clip.antiAlias,
-            shape: RoundedRectangleBorder(
-                borderRadius: BorderRadiusDirectional.circular(2)),
-            child: CachedNetworkImage(
-              imageUrl: this.url,
-              fit: BoxFit.cover,
-              placeholder: (context, url) => Center(
-                child: Container(
-                  width: 10,
-                  height: 10,
-                  child: CircularProgressIndicator(
-                    strokeWidth: 3,
-                  ),
-                ),
+            height: 50,
+            width: 50,
+            child: Card(
+              clipBehavior: Clip.antiAlias,
+              shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadiusDirectional.circular(2)),
+              child: ExtendedImage.network(
+                this.url,
+                width: 50,
+                height: 50,
+                fit: BoxFit.cover,
+                cache: true,
+                border: Border.all(color: Colors.grey, width: 1.0),
+                borderRadius: BorderRadius.all(Radius.circular(8)),
+                loadStateChanged: (state) => defaultLoadStateChanged(state),
               ),
-              errorWidget: (context, url, error) {
-                return Container(
-                  color: Colors.grey,
-                  child: Center(
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: <Widget>[
-                        Icon(
-                          Icons.error,
-                          size: 12,
-                        ),
-                        SizedBox(height: 2),
-                        Text(
-                          '加载失败',
-                          style: TextStyle(fontSize: 8),
-                        )
-                      ],
-                    ),
-                  ),
-                );
-              },
-            ),
-          ),
-        );
+            ));
       } else {
         return buildCenterIcon(Icon(IconData(0xe654, fontFamily: 'iconfont')));
       }