diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index e967fa7..8cfec1a 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -3,565 +3,941 @@ "packages": [ { "name": "ali_auth_wbq", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/zhiying_ali_auth_wbq-f6421fe5735eab13738946da8fa7405e7aa952c6/", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/zhiying_ali_auth_wbq-f6421fe5735eab13738946da8fa7405e7aa952c6/", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "archive", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.13", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.13", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "args", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/args-1.6.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/args-1.6.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "async", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.4.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.4.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "bloc", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/bloc-4.0.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/bloc-4.0.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "boolean_selector", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-2.0.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-2.0.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "cached_network_image", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/cached_network_image-2.2.0+1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/cached_network_image-2.2.0+1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "charcode", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.3", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "clock", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/clock-1.0.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/clock-1.0.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "collection", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.12", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.12", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "convert", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "1.17" }, { "name": "cookie_jar", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/cookie_jar-1.0.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/cookie_jar-1.0.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "1.20" }, { "name": "crypto", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.4", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.4", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "device_info", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+9", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+10", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "device_info_platform_interface", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info_platform_interface-1.0.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info_platform_interface-1.0.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "dio", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio-3.0.10", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio-3.0.10", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "dio_cookie_manager", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio_cookie_manager-1.0.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio_cookie_manager-1.0.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "equatable", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/equatable-1.2.5", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/equatable-1.2.5", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "ffi", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/ffi-0.1.3", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/ffi-0.1.3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "file", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/file-5.2.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/file-5.2.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "flutter", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/packages/flutter", +======= + "rootUri": "file:///Users/fnuser02/flutter/packages/flutter", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "flutter_alibc", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/zhiying_flutter_alibc-ba413f84090cd58b8b769ca43ff3ef65a0e53274/", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/zhiying_flutter_alibc-ba413f84090cd58b8b769ca43ff3ef65a0e53274/", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "flutter_bloc", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_bloc-4.0.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_bloc-4.0.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "flutter_cache_manager", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-1.4.2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-1.4.2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "flutter_native_image", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "1.19" }, { "name": "flutter_screenutil", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_screenutil-1.1.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_screenutil-1.1.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "flutter_test", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/packages/flutter_test", +======= + "rootUri": "file:///Users/fnuser02/flutter/packages/flutter_test", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "flutter_update_dialog", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_update_dialog-1.0.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_update_dialog-1.0.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "flutter_web_plugins", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/packages/flutter_web_plugins", +======= + "rootUri": "file:///Users/fnuser02/flutter/packages/flutter_web_plugins", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "flutter_xupdate", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/flutter_xupdate-d17c695461ee4588dec990533d7467c11884cd0f/", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/flutter_xupdate-d17c695461ee4588dec990533d7467c11884cd0f/", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "fluttertoast", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "http", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "http_parser", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.4", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.4", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "image", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.12", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.12", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "imei_plugin", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/imei_plugin-1.2.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/imei_plugin-1.2.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "intl", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.5" }, { "name": "jdsdk", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/jdsdk-0.0.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/jdsdk-0.0.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "loading_indicator", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/loading_indicator-1.2.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/loading_indicator-1.2.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "matcher", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.6", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.6", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "meta", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.8", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.8", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "1.12" }, { "name": "moblink", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/moblink-5472bb698d70e336cf55febb9b0a209411466632/", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/moblink-5472bb698d70e336cf55febb9b0a209411466632/", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "mobsms", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/mobsms-1.1.2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/mobsms-1.1.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "nested", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/nested-0.0.4", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/nested-0.0.4", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "package_info", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3+2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.4", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.4", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "path_provider", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.21", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.24", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_linux", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_macos", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+4", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+6", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_platform_interface", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_platform_interface-1.0.3", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_platform_interface-1.0.4", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_windows", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_windows-0.0.4+1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_windows-0.0.4+3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "pedantic", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.9.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.9.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "permission_handler", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/git/permission_handler-b8c45c4c20221ac39fe083113fc360cc632f33a4/", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/git/permission_handler-b8c45c4c20221ac39fe083113fc360cc632f33a4/", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "permission_handler_platform_interface", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler_platform_interface-2.0.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler_platform_interface-2.0.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "petitparser", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/petitparser-2.4.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/petitparser-2.4.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "photo_view", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/photo_view-0.10.2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/photo_view-0.10.2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "platform", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "1.24" }, { "name": "plugin_platform_interface", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.3", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "process", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/process-3.0.13", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/process-3.0.13", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "provider", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/provider-4.3.2+2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/provider-4.3.2+2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "quiver", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.1.3", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.1.3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "rxdart", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/rxdart-0.24.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/rxdart-0.24.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "save_image", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/save_image-1.0.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/save_image-1.0.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "secverify", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/secverify-1.0.2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/secverify-1.0.2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.12+2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.12+4", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_linux", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+4", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_macos", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+10", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+11", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_platform_interface", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_platform_interface-1.0.4", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_platform_interface-1.0.4", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_web", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_windows", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_windows-0.0.1+1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_windows-0.0.1+3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "sharesdk_plugin", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/sharesdk_plugin-1.2.8", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/sharesdk_plugin-1.2.8", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shimmer", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/shimmer-1.1.2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/shimmer-1.1.2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "1.20" }, { "name": "sky_engine", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/bin/cache/pkg/sky_engine", +======= + "rootUri": "file:///Users/fnuser02/flutter/bin/cache/pkg/sky_engine", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "1.11" }, { "name": "source_span", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.7.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.7.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "sqflite", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "sqflite_common", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite_common-1.0.2+1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite_common-1.0.2+1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "stack_trace", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "1.23" }, { "name": "stream_channel", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "string_scanner", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.5", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.5", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "synchronized", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.2.0+2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.2.0+2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.8" }, { "name": "term_glyph", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "1.8" }, { "name": "test_api", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.15", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.15", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "typed_data", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "url_launcher", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.7.5", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.7.6", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "url_launcher_linux", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_linux-0.0.1+1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_linux-0.0.1+4", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "url_launcher_macos", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+8", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+9", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "url_launcher_platform_interface", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_platform_interface-1.0.8", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_platform_interface-1.0.8", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "url_launcher_web", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.4+1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.4+1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "url_launcher_windows", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_windows-0.0.1+1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_windows-0.0.1+3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "uuid", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.2.2", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.2.2", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "vector_math", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "webview_flutter", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.24", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.24", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "win32", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.3", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.3", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "xdg_directories", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.0", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.0", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "xml", +<<<<<<< HEAD "rootUri": "file:///Users/fnuser04/Documents/flutterModel/flutter/.pub-cache/hosted/pub.flutter-io.cn/xml-3.6.1", +======= + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/xml-3.6.1", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "packageUri": "lib/", "languageVersion": "2.6" }, @@ -572,7 +948,11 @@ "languageVersion": "2.1" } ], +<<<<<<< HEAD "generated": "2020-12-28T09:15:45.435839Z", +======= + "generated": "2020-12-24T06:05:35.262664Z", +>>>>>>> b73efa519b2426758192373724065549c7515bcb "generator": "pub", "generatorVersion": "2.8.2" } diff --git a/lib/util/net_util.dart b/lib/util/net_util.dart index 4239526..b442b07 100644 --- a/lib/util/net_util.dart +++ b/lib/util/net_util.dart @@ -160,6 +160,30 @@ class NetUtil { } } + /// + /// 403028 账号被冻结 + /// 403029 账号被禁用 + /// 提示并且退出登录 + /// + if(result[GlobalConfig.HTTP_RESPONSE_KEY_CODE]?.toString() == '403028' || result[GlobalConfig.HTTP_RESPONSE_KEY_CODE]?.toString() == '403029') { + + try { + // 提示 + Fluttertoast.showToast( + msg: result[GlobalConfig.HTTP_RESPONSE_KEY_MSG], + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.BOTTOM, + ); + // 退出登录 + Future.delayed(Duration(seconds: 0)).then((onValue) { + BuildContext context = navigatorKey.currentState.overlay.context; + Provider.of(context, listen: false).unLogin(); + }); + } catch (e, s) { + Logger.error(e, s); + } + } + return result; } } catch (e) { @@ -332,7 +356,8 @@ class NetUtil { // token 读取SP缓存中的用户token String token = await SharedPreferencesUtil.getStringValue(GlobalConfig.SHARED_KEY_TOKEN); if (!EmptyUtil.isEmpty(token)) { - params['token'] = token; + // params['token'] = token; + params['Authorization'] = 'Bearer ' + token; } // secret_key params['secret_key'] = setting['secret_key'] ?? ''; diff --git a/lib/util/parse_util.dart b/lib/util/parse_util.dart index 130000d..baac1a0 100644 --- a/lib/util/parse_util.dart +++ b/lib/util/parse_util.dart @@ -14,7 +14,7 @@ class ParseUtil { Logger.warn(e, s); rlt = defVal; } - return defVal; + return rlt; } ///