更新

lib/base/base_page_view_item_state.dart

@@ -103,12 +103,12 @@ abstract class BasePageViewItemState<T extends StatefulWidget>
             position.viewportDimension);
         int index = pixels.round();
         var currentWidget = _getTabs()[index];
-        if (currentWidget
+        /*if (currentWidget
             is extended.NestedScrollViewInnerScrollPositionKeyWidget) {
           currentWidget = (currentWidget
                   as extended.NestedScrollViewInnerScrollPositionKeyWidget)
               .child;
-        }
+        }*/
         return widget == currentWidget;
       }
     }

lib/base/base_tab_bar_view_item_state.dart

@@ -92,13 +92,10 @@ abstract class BaseTabBarViewItemState<T extends StatefulWidget>
 
   bool isCurrent() {
     var currentWidget = _getTabs()[getTabController().index];
-    if (currentWidget
+    /*if (currentWidget
         is extended.NestedScrollViewInnerScrollPositionKeyWidget) {
-      currentWidget = (currentWidget
-              as extended.NestedScrollViewInnerScrollPositionKeyWidget)
-          .child;
-    }
-
+      currentWidget = (currentWidget as extended.NestedScrollViewInnerScrollPositionKeyWidget).child;
+    }*/
     return widget == currentWidget && isParentCurrent();
   }
 

lib/components/i_nested_scroll_view.dart

 import 'package:flutter/material.dart';
-import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'
-    as extended;
+import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart' as extended;
 import 'package:flutter/gestures.dart' show DragStartBehavior;
 
 typedef NestedScrollViewHeaderSliversBuilder = List<Widget> Function(
@@ -39,7 +38,7 @@ class INestedScrollView extends StatelessWidget {
       : super(key: key);
   @override
   Widget build(BuildContext context) {
-    return extended.NestedScrollView(
+    return extended.ExtendedNestedScrollView(
       controller: controller,
       scrollDirection: scrollDirection,
       reverse: reverse,
@@ -51,21 +50,8 @@ class INestedScrollView extends StatelessWidget {
       restorationId: restorationId,
       headerSliverBuilder: headerSliverBuilder,
       body: body,
-      innerScrollPositionKeyBuilder: () {
-        var index = "i_nested_scroll_view_tab_";
-        index += (_getTabController(context).index.toString());
-        return Key(index);
-      },
     );
   }
-
-  TabController _getTabController(BuildContext context) {
-    if (tabController != null) {
-      return tabController;
-    } else {
-      return DefaultTabController.of(context);
-    }
-  }
 }
 
 class INestedTabBarView extends StatelessWidget {
@@ -89,8 +75,7 @@ class INestedTabBarView extends StatelessWidget {
           physics: physics,
           dragStartBehavior: dragStartBehavior,
           children: List.generate(children.length, (index) {
-            return extended.NestedScrollViewInnerScrollPositionKeyWidget(
-                Key("i_nested_scroll_view_tab_$index"), children[index]);
+            return children[index];
           }),
         );
   }

lib/utils/permission_utils.dart

@@ -21,7 +21,7 @@ class PermissionUtils {
     for (int i = 0, len = permissions.length; i < len; i++) {
       var permission = permissions[i];
       var status = await permission.status;
-      if (status == PermissionStatus.undetermined) {
+      if (status == PermissionStatus.denied) {
         resultPermissions[permission] = PermissionUtilsStatus.denied;
       } else if (status == PermissionStatus.denied) {
         if (Platform.isIOS) {
@@ -51,7 +51,7 @@ class PermissionUtils {
     for (int i = 0, len = permissions.length; i < len; i++) {
       var permission = permissions[i];
       var status = resultMap[permission];
-      if (status == PermissionStatus.undetermined) {
+      if (status == PermissionStatus.denied) {
         resultPermissions[permission] = PermissionUtilsStatus.denied;
       } else if (status == PermissionStatus.denied) {
         if (Platform.isIOS) {

lib/utils/store_utils.dart

 import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:localstorage/localstorage.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+//import 'package:shared_preferences/shared_preferences.dart';
 import 'package:path_provider/path_provider.dart';
 
 ///
@@ -9,7 +9,7 @@ import 'package:path_provider/path_provider.dart';
 ///
 class StoreUtils {
   /// app全局配置 eg:theme
-  SharedPreferences _sharedPreferences;
+  //SharedPreferences _sharedPreferences;
 
   /// 临时目录 eg: cookie
   Directory _temporaryDirectory;
@@ -31,7 +31,7 @@ class StoreUtils {
   Future<bool> init() async {
     // async 异步操作
     // sync 同步操作
-    _sharedPreferences = await SharedPreferences.getInstance();
+    //_sharedPreferences = await SharedPreferences.getInstance();
     _localStorage = LocalStorage('LocalStorage');
     _temporaryDirectory = await getTemporaryDirectory();
     return await _localStorage.ready;
@@ -42,7 +42,7 @@ class StoreUtils {
   /// [key]                       键
   ///
   dynamic getForKey({@required String key,dynamic defaultValue}) {
-    return getStorage?.getItem(key)??defaultValue;
+    return getStorage.getItem(key)??defaultValue;
   }
 
   ///
@@ -72,9 +72,9 @@ class StoreUtils {
   ///
   /// 获取数据持久化的类
   ///
-  SharedPreferences get getShared {
+  /*SharedPreferences get getShared {
     return _sharedPreferences;
-  }
+  }*/
 
   ///
   /// 获取缓存的文件夹

lib/widget/pull_widget/widget.dart

@@ -25,8 +25,7 @@ class PullWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SmartRefresher(
-      
-      headerInsertIndex: headerInsertIndex,
+      //headerInsertIndex: headerInsertIndex,
       footer: footer,
       scrollController: scrollController,
       controller: controller,

pubspec.lock

@@ -7,179 +7,190 @@ packages:
       name: alarm_calendar
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.3"
+    version: "0.0.5"
   amaps_location:
     dependency: "direct main"
     description:
-      path: "../../plugins/amaps-location"
-      relative: true
-    source: path
+      path: "."
+      ref: null-safety
+      resolved-ref: ef36da83a9a57b4519234cf7f3f037253cf838d3
+      url: "git@git.xiaomanxiong.com:flutter-plugin/amaps-location.git"
+    source: git
     version: "1.0.0"
   android_device:
     dependency: "direct main"
     description:
       path: "."
-      ref: HEAD
-      resolved-ref: ddd142196dcd2653049595fe76abf94e31a0bcc6
+      ref: null-safety
+      resolved-ref: "943de0283089fbe7bd0292b8465a8b7c344aaa71"
       url: "http://git.xiaomanxiong.com/gitlab/lizengqiang/flutter_android_device.git"
     source: git
-    version: "0.0.1"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.13"
-  args:
+    version: "1.0.0"
+  async:
     dependency: transitive
     description:
-      name: args
+      name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.0"
+    version: "2.8.2"
   base_repository:
     dependency: transitive
     description:
-      path: "../../repository/app-base-repository"
-      relative: true
-    source: path
-    version: "0.0.1"
+      path: "."
+      ref: null-safety
+      resolved-ref: "5b60d47410e4bb47d0e8f4fc8c6be00e28b2002d"
+      url: "git@git.xiaomanxiong.com:flutter-plugin/app-base-repository.git"
+    source: git
+    version: "1.0.0"
   cached_network_image:
     dependency: "direct main"
     description:
       name: cached_network_image
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.1"
+    version: "3.1.0"
+  cached_network_image_platform_interface:
+    dependency: transitive
+    description:
+      name: cached_network_image_platform_interface
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.0"
+  cached_network_image_web:
+    dependency: transitive
+    description:
+      name: cached_network_image_web
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.1"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.3"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.15.0-nullsafety.3"
+    version: "1.15.0"
   config_module:
     dependency: "direct main"
     description:
-      path: "../config_module"
-      relative: true
-    source: path
-    version: "0.0.1"
+      path: "."
+      ref: null-safety
+      resolved-ref: "0f3041f75dbf7e71970bf76ff5d557a485710d9f"
+      url: "git@git.xiaomanxiong.com:flutter-plugin/config_module.git"
+    source: git
+    version: "1.0.0"
   connectivity:
     dependency: "direct main"
     description:
       name: connectivity
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2"
+    version: "3.0.6"
   connectivity_for_web:
     dependency: transitive
     description:
       name: connectivity_for_web
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.1+4"
+    version: "0.4.0+1"
   connectivity_macos:
     dependency: transitive
     description:
       name: connectivity_macos
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.0+7"
+    version: "0.2.1+2"
   connectivity_platform_interface:
     dependency: transitive
     description:
       name: connectivity_platform_interface
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.6"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.1"
+    version: "2.0.1"
   crypto:
     dependency: "direct main"
     description:
       name: crypto
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.5"
+    version: "3.0.1"
   device_info:
     dependency: "direct main"
     description:
       name: device_info
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.0"
+    version: "2.0.2"
   device_info_platform_interface:
     dependency: transitive
     description:
       name: device_info_platform_interface
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.1"
+    version: "2.0.1"
   dio:
     dependency: transitive
     description:
       name: dio
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.10"
+    version: "4.0.0"
   event_bus:
     dependency: "direct main"
     description:
       name: event_bus
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.1"
+    version: "2.0.0"
+  extended_list_library:
+    dependency: transitive
+    description:
+      name: extended_list_library
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.0"
   extended_nested_scroll_view:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "8c63ea56972b2bb825e66071cf9b061b32849293"
-      url: "https://gitee.com/lzq-flutter/extended_nested_scroll_view-2.0.1.git"
-    source: git
-    version: "2.0.1"
+      name: extended_nested_scroll_view
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "5.0.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.3"
+    version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.2.1"
+    version: "6.1.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -189,25 +200,25 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: HEAD
-      resolved-ref: "7a8b602f90c8a57f841ba08f8cbc37543c29f8cb"
+      ref: null-safety
+      resolved-ref: fef0dbbb7411eb50d2e0066f71877421484649f5
       url: "git@git.xiaomanxiong.com:front/flutter/flutter_album_save.git"
     source: git
-    version: "0.0.1"
+    version: "1.0.0"
   flutter_blurhash:
     dependency: transitive
     description:
       name: flutter_blurhash
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.5.0"
+    version: "0.6.0"
   flutter_boost:
     dependency: "direct main"
     description:
       path: "."
-      ref: "v3.0-preview.9"
-      resolved-ref: fe438a61ffd6df6af51226b5a48bb9f533b7a1bc
-      url: "https://github.com.cnpmjs.org/alibaba/flutter_boost.git"
+      ref: "v3.0-null-safety-preview.13"
+      resolved-ref: "153de2fbaa1f03c6685af74ec68fa8cb292a8887"
+      url: "https://gitee.com/flutter-plugin/flutter_boost.git"
     source: git
     version: "3.0.0"
   flutter_cache_manager:
@@ -216,22 +227,24 @@ packages:
       name: flutter_cache_manager
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
+    version: "3.1.2"
   flutter_native_toast:
     dependency: "direct main"
     description:
       path: "."
-      ref: HEAD
-      resolved-ref: "87f37a8a384d4cd41e8fbe9bf6ad79e750d3e548"
-      url: "git@git.xiaomanxiong.com:lizengqiang/flutter_native_toast.git"
+      ref: null-safety
+      resolved-ref: "9b4fec6bbe36dcf371d0e79eb5aafec2386a8936"
+      url: "git@git.xiaomanxiong.com:flutter-plugin/flutter_native_toast.git"
     source: git
-    version: "0.0.1"
+    version: "1.0.0"
   flutter_page_indicator:
     dependency: transitive
     description:
-      name: flutter_page_indicator
-      url: "https://pub.flutter-io.cn"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "6812decd361038f5ac8afe1de69f5ab12de0e2e5"
+      url: "git@git.xiaomanxiong.com:flutter-plugin/flutter_page_indicator.git"
+    source: git
     version: "0.0.3"
   flutter_secure_storage:
     dependency: "direct main"
@@ -239,29 +252,22 @@ packages:
       name: flutter_secure_storage
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.3.5"
-  flutter_staggered_grid:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "0de93539497ddf7a4a74c719c2e2e40549be4805"
-      url: "https://gitee.com/hxyl/flutter_staggered_grid.git"
-    source: git
-    version: "0.0.1"
+    version: "4.2.1"
   flutter_staggered_grid_view:
     dependency: "direct main"
     description:
       name: flutter_staggered_grid_view
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.4"
+    version: "0.4.1"
   flutter_swiper:
     dependency: "direct main"
     description:
-      name: flutter_swiper
-      url: "https://pub.flutter-io.cn"
-    source: hosted
+      path: "."
+      ref: null-safety
+      resolved-ref: "454016ddb1dd3b37265c6e5d8364860b40cf2653"
+      url: "git@git.xiaomanxiong.com:flutter-plugin/flutter_swiper.git"
+    source: git
     version: "1.1.6"
   flutter_web_plugins:
     dependency: transitive
@@ -272,54 +278,47 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: HEAD
-      resolved-ref: ca6aece803f84ea663dfed876188c0ac143a1ab1
+      ref: null-safety
+      resolved-ref: e2134c7dd8747d2f77f71b7f9ce4c82bf2be66e7
       url: "http://git.xiaomanxiong.com/gitlab/lizengqiang/fluttet_clipboard.git"
     source: git
     version: "1.0.6"
   fluwx:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "7b825f875efdfe5102bccc57855ae938f1fe92db"
-      url: "http://git.xiaomanxiong.com/gitlab/lizengqiang/fluwx.git"
-    source: git
-    version: "2.6.2"
+      name: fluwx
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.6.1+3"
   http:
     dependency: transitive
     description:
       name: http
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.2"
+    version: "0.13.4"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.4"
-  image:
+    version: "4.0.0"
+  js:
     dependency: transitive
     description:
-      name: image
+      name: js
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.19"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.16.1"
+    version: "0.6.3"
   life_repository:
     dependency: "direct main"
     description:
-      path: "../../repository/app-life-repository"
-      relative: true
-    source: path
+      path: "."
+      ref: null-safety
+      resolved-ref: "97bf3e0f9c3304ffd86579cf28ffda7d554d49c0"
+      url: "git@git.xiaomanxiong.com:flutter-plugin/app-life-repository.git"
+    source: git
     version: "0.0.1"
   localstorage:
     dependency: "direct main"
@@ -327,246 +326,195 @@ packages:
       name: localstorage
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "4.0.0+1"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.7.0"
   modal:
     dependency: "direct main"
     description:
       path: "."
-      ref: "1.2.7"
-      resolved-ref: "13762c4c227a2112d5fd7fb9b997a9df156d1322"
-      url: "http://git.xiaomanxiong.com/gitlab/front/flutter/flutter_modal.git"
+      ref: null-safety
+      resolved-ref: e4c3dc9abcb73bc78dba38754df6e2fbf3491d2f
+      url: "git@git.xiaomanxiong.com:front/flutter/flutter_modal.git"
     source: git
     version: "1.2.6"
   mvp:
     dependency: "direct main"
     description:
-      path: "../mvp"
-      relative: true
-    source: path
+      path: "."
+      ref: null-safety
+      resolved-ref: a16149d1de577c73af52064862ee7af585a6300b
+      url: "git@git.xiaomanxiong.com:flutter-plugin/mvp.git"
+    source: git
     version: "0.0.1"
   navigation_bar:
     dependency: "direct main"
     description:
-      path: "plugins/navigation_bar"
-      relative: true
-    source: path
-    version: "0.0.1"
+      path: "."
+      ref: null-safety
+      resolved-ref: "7e9377e44c84824900f23454c5784f55a31d2a23"
+      url: "git@git.xiaomanxiong.com:wangll/navigation_bar.git"
+    source: git
+    version: "1.0.0"
   nested:
     dependency: transitive
     description:
       name: nested
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.4"
+    version: "1.0.0"
   octo_image:
     dependency: transitive
     description:
       name: octo_image
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.0"
+    version: "1.0.0+1"
   package_info:
     dependency: "direct main"
     description:
       name: package_info
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.3+4"
+    version: "2.0.2"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.28"
+    version: "2.0.5"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1+2"
+    version: "2.1.0"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.4+8"
+    version: "2.0.2"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.1"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.4+3"
+    version: "2.0.3"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.2"
+    version: "1.11.1"
   permission_handler:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "5.0.1+1"
-      resolved-ref: "17e8d5152533ecc0c4d3b83ab9aecd39884feef4"
-      url: "http://git.xiaomanxiong.com/gitlab/lizengqiang/flutter-permission-handler.git"
-    source: git
-    version: "5.1.0+2"
-  permission_handler_platform_interface:
-    dependency: transitive
-    description:
-      name: permission_handler_platform_interface
+      name: permission_handler
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2"
-  petitparser:
+    version: "8.2.5"
+  permission_handler_platform_interface:
     dependency: transitive
     description:
-      name: petitparser
+      name: permission_handler_platform_interface
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.0"
+    version: "3.7.0"
   photo_view:
     dependency: "direct main"
     description:
       name: photo_view
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.10.3"
+    version: "0.13.0"
   platform:
     dependency: transitive
     description:
       name: platform
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.1"
+    version: "3.0.2"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.3"
+    version: "2.0.2"
   process:
     dependency: transitive
     description:
       name: process
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.13"
+    version: "4.2.3"
   provider:
     dependency: transitive
     description:
       name: provider
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.3.3"
+    version: "6.0.1"
   pull_to_refresh:
     dependency: transitive
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "23c856ca4c948f02518038fdc9697de6fe898957"
-      url: "http://git.xiaomanxiong.com/gitlab/lizengqiang/pull_to_refresh-1.6.3.git"
-    source: git
-    version: "1.6.3"
+      name: pull_to_refresh
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.0"
   qr:
     dependency: transitive
     description:
       name: qr
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "2.1.0"
   qr_flutter:
     dependency: "direct main"
     description:
       name: qr_flutter
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.25.0"
+    version: "0.27.2"
   share_extend:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "5efd165f3cb80f4c1dc0f8cbb446b1a689568766"
-      url: "http://git.xiaomanxiong.com/gitlab/lizengqiang/ShareExtend.git"
-    source: git
-    version: "1.1.9"
-  shared_preferences:
-    dependency: "direct main"
-    description:
-      name: shared_preferences
+      name: share_extend
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.5.12+4"
-  shared_preferences_linux:
-    dependency: transitive
-    description:
-      name: shared_preferences_linux
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.0.2+4"
-  shared_preferences_macos:
-    dependency: transitive
-    description:
-      name: shared_preferences_macos
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.0.1+11"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.0.4"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.1.2+7"
-  shared_preferences_windows:
-    dependency: transitive
-    description:
-      name: shared_preferences_windows
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.0.2+3"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -578,48 +526,50 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.1"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.2+4"
+    version: "2.0.0+4"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.3+3"
+    version: "2.0.1+1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.0+2"
+    version: "3.0.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   transformer_page_view:
     dependency: transitive
     description:
-      name: transformer_page_view
-      url: "https://pub.flutter-io.cn"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: f04b1b9ec098707ab63864aba868fe515decfe3c
+      url: "git@git.xiaomanxiong.com:flutter-plugin/transformer_page_view.git"
+    source: git
     version: "0.1.6"
   typed_data:
     dependency: transitive
@@ -627,13 +577,13 @@ packages:
       name: typed_data
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   umeng_common_sdk:
     dependency: "direct main"
     description:
       path: "."
-      ref: HEAD
-      resolved-ref: b452f6966cf4fdffa5899090581726f1db1ca5c8
+      ref: null-safety
+      resolved-ref: "9ba58020e6e1f98616120a3385015ff180012f85"
       url: "git@git.xiaomanxiong.com:flutter-plugin/umeng_common_flutter.git"
     source: git
     version: "1.2.2"
@@ -641,99 +591,88 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: HEAD
-      resolved-ref: "076713525fad45e8ff9ef220fcb1464ae0fb2c08"
+      ref: null-safety
+      resolved-ref: "15441a7eb61a1320279c6a9a25bc5a8f8eea49c1"
       url: "git@git.xiaomanxiong.com:flutter-plugin/umeng-crash.git"
     source: git
     version: "2.0.1"
   url_launcher:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: d90fed553a8e119be3eaa42b290e5404dd2e066a
-      url: "http://git.xiaomanxiong.com/gitlab/lizengqiang/url_launcher.git"
-    source: git
-    version: "5.7.10"
+      name: url_launcher
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "6.0.12"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1+4"
+    version: "2.0.2"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1+9"
+    version: "2.0.2"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.9"
+    version: "2.0.4"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.5+3"
+    version: "2.0.4"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1+3"
+    version: "2.0.2"
   uuid:
     dependency: transitive
     description:
       name: uuid
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.2"
+    version: "3.0.5"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   waterfall_flow:
     dependency: "direct main"
     description:
-      path: "."
-      ref: master
-      resolved-ref: d4928c02a081c3aaa6e637d5e190dd242cdd1a43
-      url: "git@git.xiaomanxiong.com:flutter-plugin/waterfall_flow.git"
-    source: git
-    version: "2.0.5"
+      name: waterfall_flow
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.1"
   win32:
     dependency: transitive
     description:
       name: win32
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.4+1"
+    version: "2.2.9"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.2"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "4.5.1"
+    version: "0.2.0"
 sdks:
-  dart: ">=2.10.2 <2.11.0"
-  flutter: ">=1.22.4 <2.0.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"

pubspec.yaml

@@ -15,8 +15,8 @@ dependencies:
   event_bus: ^2.0.0
   url_launcher: ^6.0.12
   connectivity: ^3.0.6
-  localstorage: ^3.0.6
-  shared_preferences: ^2.0.8
+  localstorage: ^4.0.0+1
+  #shared_preferences: ^2.0.8
   cached_network_image: ^3.1.0
   qr_flutter: ^4.0.0
   package_info: ^2.0.2