升级第三方插件

Author: 师春雷

lib/page/mine_page.dart

@@ -196,11 +196,37 @@ class _MinePageState extends State<MinePage> {
   Future<Null> _cropImage(File imageFile) async {
     assert(imageFile != null);
     File croppedFile = await ImageCropper.cropImage(
+      /// 图像文件的绝对路径。
       sourcePath: imageFile.path,
-      ratioX: 1.0,
-      ratioY: 1.0,
-      maxWidth: 512,
-      maxHeight: 512,
+
+      /// 最大裁剪的图像宽度
+      maxWidth: 256,
+
+      /// 最大裁剪的图像高度
+      maxHeight: 256,
+
+      /// 控制裁剪菜单视图中纵横比的列表。在Android中，您可以通过设置的值来设置启动裁切器时的初始化纵横比AndroidUiSettings.initAspectRatio
+      aspectRatioPresets: [CropAspectRatioPreset.square],
+
+      /// 控制裁剪边界的样式，可以是矩形或圆形样式
+      cropStyle: CropStyle.circle,
+
+      /// 结果图像的格式，png或jpg
+      compressFormat: ImageCompressFormat.jpg,
+
+      /// 用于控制图像压缩的质量，取值范围[1-100]
+      compressQuality: 100,
+      androidUiSettings: AndroidUiSettings(
+        toolbarTitle: "裁剪",
+        toolbarColor: Theme.of(context).accentColor,
+        statusBarColor: Theme.of(context).accentColor,
+        toolbarWidgetColor: Colors.white,
+      ),
+      iosUiSettings: IOSUiSettings(
+        minimumAspectRatio: 1.0,
+        doneButtonTitle: S.of(context).sure,
+        cancelButtonTitle: S.of(context).cancel,
+      ),
     );
 
     debugPrint('cropImage=============${croppedFile.path}');

lib/service/api_service.dart

@@ -9,7 +9,7 @@ import 'package:html/parser.dart' show parse;
 
 import '../page_index.dart';
 
-class ApiService<T> {
+class ApiService {
   /// 豆瓣电影首页数据
   static Future<MovieHomeData> getMovieHomeData({String city}) async {
     Response response =

lib/utils/file_util.dart

@@ -15,6 +15,12 @@ class FileUtil {
 
   FileUtil._internal();
 
+  Future<String> getTempPath() async {
+    Directory tempDir = await getTemporaryDirectory();
+    String path = tempDir.path;
+    return path;
+  }
+
   Future<String> getFolderPath(String folderPath) async {
     Directory tempDir = await getApplicationDocumentsDirectory();
     String path = tempDir.path + folderPath;

lib/utils/http_utils.dart

@@ -1,29 +1,23 @@
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:cookie_jar/cookie_jar.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_app/global/config.dart';
-import 'package:flutter_app/service/api_url.dart';
+
+import '../page_index.dart';
 
 class HttpUtils {
   /// http request methods
   static const String GET = 'get';
   static const String POST = 'post';
-  static const String PUT = 'put';
-  static const String PATCH = 'patch';
-  static const String DELETE = 'delete';
 
   Dio _dio;
-  BaseOptions options;
 
   CancelToken cancelToken = CancelToken();
 
   Dio get dio => _dio;
 
-  static const CONTENT_TYPE_JSON = "application/json";
-  static const CONTENT_TYPE_FORM = "application/x-www-form-urlencoded";
-
   HttpUtils({String baseUrl: ApiUrl.BASE_URL}) {
     debugPrint('dio赋值=====$baseUrl');
 
@@ -42,8 +36,9 @@ class HttpUtils {
       responseType: ResponseType.plain,
 
       /// 请求的Content-Type，默认值是[ContentType.json]. 也可以用ContentType.parse("application/x-www-form-urlencoded")
-      contentType:
-          ContentType('application', CONTENT_TYPE_FORM, charset: 'utf-8'),
+      contentType: ContentType(
+          'application', 'application/x-www-form-urlencoded',
+          charset: 'utf-8'),
 
       /// Http请求头.
       headers: {
@@ -219,4 +214,127 @@ class HttpUtils {
   void cancelRequests(CancelToken token) {
     token.cancel("cancelled");
   }
+
+  get(
+    String path,
+    Function successCallBack, {
+    Map<String, dynamic> params,
+    CancelToken cancelToken,
+    Options options,
+    Function errorCallBack,
+  }) async {
+    _requestHttp(path, successCallBack,
+        method: GET,
+        params: params,
+        errorCallBack: errorCallBack,
+        options: options,
+        cancelToken: cancelToken);
+  }
+
+  post(
+    String path,
+    Function successCallBack, {
+    Map<String, dynamic> params,
+    CancelToken cancelToken,
+    Options options,
+    Function errorCallBack,
+  }) async {
+    _requestHttp(path, successCallBack,
+        method: POST,
+        params: params,
+        errorCallBack: errorCallBack,
+        options: options,
+        cancelToken: cancelToken);
+  }
+
+  _requestHttp(
+    String path,
+    Function successCallBack, {
+    String method,
+    Map<String, dynamic> params,
+    Function errorCallBack,
+    CancelToken cancelToken,
+    Options options,
+  }) async {
+    Response response;
+    try {
+      if (method == GET) {
+        if (params != null && params.isNotEmpty) {
+          response = await dio.get(path,
+              queryParameters: params,
+              options: _checkOptions(method, options),
+              cancelToken: cancelToken);
+        } else {
+          response = await dio.get(path,
+              options: _checkOptions(method, options),
+              cancelToken: cancelToken);
+        }
+      } else if (method == POST) {
+        if (params != null && params.isNotEmpty) {
+          response = await dio
+              .post(path, data: params, options: _checkOptions(method, options),
+                  onReceiveProgress: (int count, int total) {
+            debugPrint(
+                'onReceiveProgress: ${(count / total * 100).toStringAsFixed(0)} %');
+          }, onSendProgress: (int count, int total) {
+            debugPrint(
+                'onSendProgress: ${(count / total * 100).toStringAsFixed(0)} %');
+          }, cancelToken: cancelToken);
+        } else {
+          response = await dio
+              .post(path, options: _checkOptions(method, options),
+                  onReceiveProgress: (int count, int total) {
+            debugPrint(
+                'onReceiveProgress: ${(count / total * 100).toStringAsFixed(0)} %');
+          }, onSendProgress: (int count, int total) {
+            debugPrint(
+                'onSendProgress: ${(count / total * 100).toStringAsFixed(0)} %');
+          }, cancelToken: cancelToken);
+        }
+      }
+
+      /// debug模式才打印
+      if (Config.DEBUG) {
+        /// 响应数据，可能已经被转换了类型, 详情请参考Options中的[ResponseType].
+        debugPrint('$method请求成功!response.data：${response.data}');
+
+        /// 响应头
+        debugPrint('$method请求成功!response.headers：${response.headers}');
+
+        /// 本次请求信息
+        debugPrint('$method请求成功!response.request：${response.request}');
+
+        /// Http status code.
+        debugPrint('$method请求成功!response.statusCode：${response.statusCode}');
+      }
+    } on DioError catch (error) {
+      // 请求错误处理
+      debugPrint(error.response.toString());
+      formatError(error);
+
+      // debug模式才打印
+      if (Config.DEBUG) {
+        debugPrint('请求异常: ' + error.toString());
+        debugPrint('请求异常url: ' + path);
+        debugPrint('请求头: ' + dio.options.headers.toString());
+        debugPrint('method: ' + dio.options.method);
+      }
+      _error(errorCallBack, error.message);
+      return '';
+    }
+    String dataStr = json.encode(response.data);
+    Map<String, dynamic> dataMap = json.decode(dataStr);
+    if (dataMap == null || dataMap['code'] == 0) {
+      _error(errorCallBack,
+          '错误码：' + dataMap['code'].toString() + dataMap['message'].toString());
+    } else if (successCallBack != null) {
+      successCallBack(dataMap);
+    }
+  }
+
+  _error(Function errorCallBack, String error) {
+    if (errorCallBack != null) {
+      errorCallBack(error);
+    }
+  }
 }

pubspec.lock

@@ -77,21 +77,21 @@ packages:
       name: charts_common
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.8.0"
+    version: "0.8.1"
   charts_flutter:
     dependency: "direct main"
     description:
       name: charts_flutter
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.8.0"
+    version: "0.8.1"
   chewie:
     dependency: "direct main"
     description:
       name: chewie
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.9.7"
+    version: "0.9.8+1"
   city_picker:
     dependency: "direct main"
     description:
@@ -105,7 +105,7 @@ packages:
       name: city_pickers
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.25"
+    version: "0.1.27"
   clippy_flutter:
     dependency: "direct main"
     description:
@@ -175,7 +175,7 @@ packages:
       name: device_info
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.0+2"
+    version: "0.4.0+3"
   dio:
     dependency: "direct main"
     description:
@@ -202,7 +202,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "1195ba57f144ab7ad23cc8b054f8153096b5ee60"
+      resolved-ref: "375653ba14bc7bb20c137c8b422c4c1dfdce7400"
       url: "https://github.com/iampawan/Flute-Music-Player"
     source: git
     version: "0.0.6"
@@ -266,7 +266,7 @@ packages:
       name: flutter_sound
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.4.5"
+    version: "1.4.8"
   flutter_spinkit:
     dependency: "direct main"
     description:
@@ -313,7 +313,7 @@ packages:
       name: html
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.14.0+2"
+    version: "0.14.0+3"
   http:
     dependency: "direct main"
     description:
@@ -334,14 +334,14 @@ packages:
       name: image_cropper
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.1+4"
+    version: "0.6.1+7"
   image_picker_saver:
     dependency: "direct main"
     description:
@@ -404,7 +404,7 @@ packages:
       name: multi_image_picker
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.5.5"
+    version: "4.5.8"
   open_iconic_flutter:
     dependency: transitive
     description:
@@ -530,7 +530,7 @@ packages:
       name: rxdart
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.22.2"
+    version: "0.22.3"
   screen:
     dependency: transitive
     description:
@@ -544,7 +544,7 @@ packages:
       name: share
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.2+1"
+    version: "0.6.2+3"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -577,7 +577,7 @@ packages:
       name: sqflite
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.6+4"
+    version: "1.1.7+1"
   stack_trace:
     dependency: transitive
     description:
@@ -654,7 +654,7 @@ packages:
       name: url_launcher
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.1.3"
+    version: "5.1.6"
   uuid:
     dependency: transitive
     description:
@@ -675,7 +675,7 @@ packages:
       name: video_player
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.10.2+1"
+    version: "0.10.2+3"
 sdks:
-  dart: ">=2.3.0-dev.0.5.flutter-a1668566e5 <3.0.0"
-  flutter: ">=1.7.8 <2.0.0"
+  dart: ">=2.5.0 <3.0.0"
+  flutter: ">=1.9.1 <2.0.0"