From 4d1dd0686be5eb1e7545550c976f49cec3ea490b Mon Sep 17 00:00:00 2001
From: zhangmeng <494089941@qq.com>
Date: Thu, 22 Apr 2021 18:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=EF=BC=9A=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=AE=8C=E6=88=90=20=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pubspec.lock | 128 +++++++++++++++++++++++++++++++--------------------
 pubspec.yaml |   7 ++-
 2 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 0432a92..92dc238 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "14.0.0"
+    version: "21.0.0"
   aku_ui:
     dependency: "direct main"
     description:
@@ -46,7 +46,7 @@ packages:
       name: analyzer
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.41.2"
+    version: "1.5.0"
   animator:
     dependency: transitive
     description:
@@ -60,7 +60,7 @@ packages:
       name: args
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.0"
+    version: "2.0.0"
   async:
     dependency: transitive
     description:
@@ -96,6 +96,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.1"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.1"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.0"
   carousel_slider:
     dependency: "direct main"
     description:
@@ -117,13 +131,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.1"
   cli_util:
     dependency: transitive
     description:
       name: cli_util
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
   clock:
     dependency: transitive
     description:
@@ -138,13 +159,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.15.0"
-  colorize:
-    dependency: transitive
-    description:
-      name: colorize
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.0"
   common_utils:
     dependency: "direct main"
     description:
@@ -179,7 +193,7 @@ packages:
       name: dart_style
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.12"
+    version: "2.0.0"
   decimal:
     dependency: transitive
     description:
@@ -249,7 +263,7 @@ packages:
       name: file
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.2.1"
+    version: "6.1.0"
   firebase_core:
     dependency: "direct main"
     description:
@@ -290,13 +304,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_asset_generator:
-    dependency: "direct dev"
-    description:
-      name: flutter_asset_generator
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.6.1"
   flutter_easyrefresh:
     dependency: "direct main"
     description:
@@ -360,14 +367,14 @@ packages:
       name: glob
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "2.0.1"
   grinder:
     dependency: "direct dev"
     description:
       name: grinder
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.8.6"
+    version: "0.9.0"
   highlight:
     dependency: transitive
     description:
@@ -430,7 +437,7 @@ packages:
       name: import_sorter
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.4.1"
+    version: "4.4.3"
   intl:
     dependency: transitive
     description:
@@ -438,13 +445,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.17.0"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.3.4"
   jpush_flutter:
     dependency: "direct main"
     description:
@@ -461,6 +461,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.3"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.0.1"
+  json_serializable:
+    dependency: "direct main"
+    description:
+      name: json_serializable
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.1.1"
   logger:
     dependency: "direct main"
     description:
@@ -468,6 +482,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.1"
   matcher:
     dependency: transitive
     description:
@@ -489,27 +510,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
-  node_interop:
-    dependency: transitive
-    description:
-      name: node_interop
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.2.1"
-  node_io:
-    dependency: transitive
-    description:
-      name: node_io
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.2.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.3"
+    version: "2.0.0"
   package_info:
     dependency: transitive
     description:
@@ -546,7 +553,7 @@ packages:
     source: hosted
     version: "1.2.0"
   pedantic:
-    dependency: transitive
+    dependency: "direct dev"
     description:
       name: pedantic
       url: "https://pub.flutter-io.cn"
@@ -607,7 +614,14 @@ packages:
       name: pub_semver
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.4.4"
+    version: "2.0.0"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.0"
   qr_code_scanner:
     dependency: "direct main"
     description:
@@ -623,7 +637,7 @@ packages:
     source: hosted
     version: "1.0.0"
   shimmer:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: shimmer
       url: "https://pub.flutter-io.cn"
@@ -634,6 +648,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.0"
   source_span:
     dependency: transitive
     description:
@@ -690,6 +711,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.19"
+  tint:
+    dependency: transitive
+    description:
+      name: tint
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.0"
   typed_data:
     dependency: transitive
     description:
@@ -766,14 +794,14 @@ packages:
       name: watcher
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.9.7+15"
+    version: "1.0.0"
   yaml:
     dependency: transitive
     description:
       name: yaml
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.1"
+    version: "3.1.0"
 sdks:
   dart: ">=2.12.0 <3.0.0"
   flutter: ">=2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 571de48..d647f24 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -56,6 +56,8 @@ dependencies:
   #谷歌崩溃分析
   firebase_core: ^1.0.3
   firebase_crashlytics: ^2.0.0
+  #json序列化
+  json_serializable: ^4.1.1
   
   power_logger: ^1.0.1-nullsafety.1
   logger: ^1.0.0
@@ -68,14 +70,15 @@ dependencies:
   jpush_flutter: 
     git: 
       url: http://159.75.73.143:8080/third_packages/jpush_flutter
+  
+  shimmer: ^2.0.0-nullsafety.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
   import_sorter:
   grinder:
-  flutter_asset_generator: ^0.6.1
-  shimmer: ^2.0.0-nullsafety.0
+  pedantic:
 
 flutter:
   uses-material-design: true