添加路由通用逻辑;

ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

lib/main.dart

@@ -3,7 +3,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/router/my_navigator.dart';
-import 'package:lszlgl/router/my_router.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
@@ -36,7 +35,6 @@ class MyApp extends StatelessWidget {
         ),
         useMaterial3: true,
       ),
-      navigatorObservers: [FlutterSmartDialog.observer],
       builder: FlutterSmartDialog.init(),
       localizationsDelegates: const [
         GlobalMaterialLocalizations.delegate,
@@ -44,8 +42,13 @@ class MyApp extends StatelessWidget {
         GlobalWidgetsLocalizations.delegate,
       ],
       supportedLocales: const [Locale('zh')],
-      onGenerateRoute: rOnGenerateRoute,
-      navigatorKey: Nav.navigatorKey,
+      navigatorKey: MyNavigator.navigator,
+      onGenerateRoute: MyNavigator.generateRoute,
+      navigatorObservers: [
+        MyNavigator.navigatorObs,
+        MyNavigator.routeObs,
+        FlutterSmartDialog.observer,
+      ],
     );
   }
 }

lib/page/reap_step/reap_sample_task/reap_sample_task_page.dart

@@ -13,7 +13,6 @@ import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_disaster_page
 import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_medicine_page.dart';
 import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_org_page.dart';
 import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_variety_page.dart';
-import 'package:lszlgl/page/reap_step/reap_step_list_page.dart';
 
 /// 收货扦样任务
 class ReapSampleTaskPage extends StatefulWidget {
@@ -48,7 +47,7 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
   }
 
   void submit() {
-    Nav.pop();
+    MyNavigator.pop();
     SmartDialog.showToast('提交成功');
   }
 

lib/page/user_center/change_pwd_page.dart

@@ -32,7 +32,7 @@ class _ChangePwdPageState extends BaseState<ChangePwdPage> {
 
   void onChange() {
     SmartDialog.showToast('修改成功');
-    Nav.pop();
+    MyNavigator.pop();
   }
 
   @override

lib/page/user_center/setting_page.dart

@@ -20,7 +20,7 @@ class _SettingPageState extends BaseState<SettingPage> {
 
   void onSave() {
     SmartDialog.showToast('保存成功');
-    Nav.pop();
+    MyNavigator.pop();
   }
 
   @override

lib/router/my_navigator.dart

@@ -1,56 +1,383 @@
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:lszlgl/base/base_state.dart';
+import 'package:lszlgl/page/unknow_page.dart';
+import 'package:flutter_smart_dialog/src/data/animation_param.dart' as dialog;
 
-class Nav {
-  Nav._();
+/// 路由监听
+class NavigatorPageObserver extends NavigatorObserver {
+  static final NavigatorPageObserver instance = NavigatorPageObserver._();
 
-  static GlobalKey<NavigatorState> navigatorKey = GlobalKey();
+  NavigatorPageObserver._();
 
-  static NavigatorState navigator() => navigatorKey.currentState!;
+  /// 路由信息
+  /// 外部可以调用[MyNavigator.routeInfo]取值
+  final RouteModel routeInfo = RouteModel();
 
+  @override
+  void didPush(Route<dynamic> route, Route<dynamic>? previousRoute) {
+    // 路由入栈
+    routeInfo.update(showRoute: route, hideRoute: previousRoute);
+    debugPrint('路由入栈 didPush：$routeInfo');
+    _pageRecord();
+  }
+
+  @override
+  void didPop(Route<dynamic> route, Route<dynamic>? previousRoute) {
+    // 路由出栈
+    routeInfo.update(showRoute: previousRoute, hideRoute: route);
+    debugPrint('路由出栈 didPop：$routeInfo');
+    _pageRecord();
+  }
+
+  @override
+  void didRemove(Route<dynamic> route, Route<dynamic>? previousRoute) {
+    routeInfo.update(showRoute: previousRoute, hideRoute: route);
+    // 路由移除
+    debugPrint('路由移除 didRemove：$routeInfo');
+  }
+
+  @override
+  void didReplace({Route<dynamic>? newRoute, Route<dynamic>? oldRoute}) {
+    // 路由替换
+    routeInfo.update(showRoute: newRoute, hideRoute: oldRoute);
+    debugPrint('路由替换 didReplace：$routeInfo');
+    _pageRecord();
+  }
+
+  @override
+  void didStartUserGesture(Route<dynamic> route, Route<dynamic>? previousRoute) {
+    // 手势控制路由
+  }
+
+  @override
+  void didStopUserGesture() {
+    // 手势控制路由结束
+  }
+
+  /// 页面统计
+  void _pageRecord() {
+    if (routeInfo.hideName != null) {
+      // 页面关闭
+    }
+    if (routeInfo.showName != null) {
+      // 页面显示
+    }
+  }
+}
+
+class RouteModel {
+  /// 显示的路由
+  Route<dynamic>? showRoute;
+
+  /// 隐藏的路由
+  Route<dynamic>? hideRoute;
+
+  /// 前一个 widget 是否是一个页面（最好统一使用自定义路由）
+  bool get isPage => hideRoute is PageRoute;
+
+  /// 前一个 widget 是否是弹框
+  bool get isDialog => !isPage;
+
+  RouteModel();
+
+  void update({Route<dynamic>? showRoute, Route<dynamic>? hideRoute}) {
+    this.showRoute = showRoute;
+    this.hideRoute = hideRoute;
+  }
+
+  /// 显示路由的名称
+  String? get showName => showRoute?.settings.name;
+
+  /// 显示路由的配置信息
+  Object? get showPageSetting => showRoute?.settings.arguments;
+
+  /// 显示路由的业务参数
+  Object? get showArguments {
+    Object? args = showRoute!.settings.arguments;
+    if (args != null) {
+      if (args is PageSetting) {
+        // PageSetting的参数
+        return args.arguments;
+      } else {
+        // 原参数
+        return args;
+      }
+    }
+    return null;
+  }
+
+  /// 隐藏/移除路由的名称
+  String? get hideName => hideRoute?.settings.name;
+
+  /// 隐藏/移除路由的配置信息
+  Object? get hidePageSetting => hideRoute?.settings.arguments;
+
+  /// 隐藏/移除路由的业务参数
+  Object? get hideArguments {
+    Object? args = hideRoute!.settings.arguments;
+    if (args != null) {
+      if (args is PageSetting) {
+        // PageSetting的参数
+        return args.arguments;
+      } else {
+        // 原参数
+        return args;
+      }
+    }
+    return null;
+  }
+
+  @override
+  String toString() {
+    return 'showType:${showRoute.runtimeType} showName:$showName showSetting:$showPageSetting '
+        'hideType:${hideRoute.runtimeType} hideName:$hideName hideSetting:$hidePageSetting';
+  }
+}
+
+/// 路由页面Builder函数
+typedef MyNavigatorBuilder = Widget Function(BuildContext context, Object? arguments);
+
+class MyNavigator {
+  MyNavigator._();
+
+  /// 全局Navigator
+  static final GlobalKey<NavigatorState> navigator = GlobalKey<NavigatorState>();
+
+  /// 全局路由监听
+  static final NavigatorPageObserver navigatorObs = NavigatorPageObserver.instance;
+
+  /// 最新路由信息
+  static RouteModel routeInfo = navigatorObs.routeInfo;
+
+  /// Widget路由监听
+  static final RouteObserver<ModalRoute<void>> routeObs = RouteObserver<ModalRoute<void>>();
+
+  /// 自定义路由拦截
+  static Route<dynamic> generateRoute(RouteSettings settings) {
+    var routeName = settings.name;
+
+    // 是否dialog
+    bool fullscreenDialog = false;
+    // 是否可截屏
+    bool allowSnapshotting = true;
+    // 业务传参
+    Object? args;
+    // 页面路由样式
+    RouteType routeType = RouteType.cupertino;
+    // 获取路由配置
+    if (settings.arguments != null && settings.arguments is PageSetting) {
+      PageSetting pageSetting = settings.arguments as PageSetting;
+      fullscreenDialog = pageSetting.fullscreenDialog ?? false;
+      allowSnapshotting = pageSetting.allowSnapshotting ?? true;
+      routeType = pageSetting.routeType ?? RouteType.cupertino;
+    } else {
+      args = settings.arguments;
+    }
+    // 创建路由
+    MyNavigatorBuilder? builder = rRouteMap[routeName];
+    builder ??= (context, args) => UnknownPage(name: settings.name);
+    switch (routeType) {
+      case RouteType.material:
+        return MaterialPageRoute(
+          builder: (context) => builder!.call(context, args),
+          settings: settings,
+          fullscreenDialog: fullscreenDialog,
+          allowSnapshotting: allowSnapshotting,
+        );
+      case RouteType.normal:
+        return PageRouteBuilder(
+          pageBuilder: (context, animation, secondaryAnimation) => builder!.call(context, args),
+          settings: settings,
+          fullscreenDialog: fullscreenDialog,
+          allowSnapshotting: allowSnapshotting,
+        );
+      case RouteType.cupertino:
+      default:
+        return CupertinoPageRoute(
+          builder: (context) => builder!.call(context, args),
+          settings: settings,
+          fullscreenDialog: fullscreenDialog,
+          allowSnapshotting: allowSnapshotting,
+        );
+    }
+  }
+
+  /// 添加新页面
   static Future<T?> push<T extends Object?>(
     String name, {
     Object? args,
+    bool fullscreenDialog = false,
+    bool allowSnapshotting = true,
+    RouteType routeType = RouteType.cupertino,
   }) {
-    return navigator().pushNamed(name, arguments: args);
+    PageSetting setting = PageSetting(
+      arguments: args,
+      fullscreenDialog: fullscreenDialog,
+      allowSnapshotting: allowSnapshotting,
+      routeType: routeType,
+    );
+    return navigator.currentState!.pushNamed(name, arguments: setting);
   }
 
-  static Future<T?> pushReplacement<T extends Object?, TO extends Object?>(
+  /// 添加新页面 并 替换当前页面
+  static Future<T?> pushReplace<T extends Object?, TO extends Object?>(
     String name, {
     TO? result,
     Object? args,
+    bool fullscreenDialog = false,
+    bool allowSnapshotting = true,
+    RouteType routeType = RouteType.cupertino,
   }) {
-    return navigator().pushReplacementNamed(name, result: result, arguments: args);
+    PageSetting setting = PageSetting(
+      arguments: args,
+      fullscreenDialog: fullscreenDialog,
+      allowSnapshotting: allowSnapshotting,
+      routeType: routeType,
+    );
+    return navigator.currentState!.pushReplacementNamed(name, result: result, arguments: setting);
   }
 
-  static Future<T?> pushAndRemoveUntil<T extends Object?>(
+  /// 添加新页面 并 移除一些页面,直至predicate返回true
+  static Future<T?> pushRemoveUntil<T extends Object?>(
     String name,
     RoutePredicate predicate, {
     Object? args,
+    bool fullscreenDialog = false,
+    bool allowSnapshotting = true,
+    RouteType routeType = RouteType.cupertino,
   }) {
-    return navigator().pushNamedAndRemoveUntil(name, predicate, arguments: args);
+    PageSetting setting = PageSetting(
+      arguments: args,
+      fullscreenDialog: fullscreenDialog,
+      allowSnapshotting: allowSnapshotting,
+      routeType: routeType,
+    );
+    return navigator.currentState!.pushNamedAndRemoveUntil(name, predicate, arguments: setting);
   }
 
+  /// 移除路由栈顶页面
   static void pop<T extends Object?>([T? result]) {
-    return navigator().pop(result);
-  }
-
-  static void popUntil(RoutePredicate predicate) {
-    return navigator().popUntil(predicate);
+    return navigator.currentState!.pop(result);
   }
 
+  /// 移除路由栈顶页面 并 添加新页面
   static Future<T?> popAndPush<T extends Object?, TO extends Object?>(
     String name, {
     TO? result,
     Object? args,
+    bool fullscreenDialog = false,
+    bool allowSnapshotting = true,
+    RouteType routeType = RouteType.cupertino,
   }) {
-    return navigator().popAndPushNamed(name, result: result, arguments: args);
+    PageSetting setting = PageSetting(
+      arguments: args,
+      fullscreenDialog: fullscreenDialog,
+      allowSnapshotting: allowSnapshotting,
+      routeType: routeType,
+    );
+    return navigator.currentState!.popAndPushNamed(name, result: result, arguments: setting);
   }
 
-  static bool canPop() {
-    return navigator().canPop();
+  /// 移除一些页面, 直至predicate返回true
+  static void popUntil(RoutePredicate predicate) {
+    return navigator.currentState!.popUntil(predicate);
   }
 
-  static Future<bool> maybePop<T extends Object?>([T? result]) {
-    return navigator().maybePop(result);
+  /// 显示Dialog
+  static Future<T?> pushDialog<T>({
+    required WidgetBuilder builder,
+    SmartDialogController? controller,
+    Alignment? alignment,
+    bool? clickMaskDismiss,
+    bool? usePenetrate,
+    bool? useAnimation,
+    SmartAnimationType? animationType,
+    List<SmartNonAnimationType>? nonAnimationTypes,
+    dialog.AnimationBuilder? animationBuilder,
+    Duration? animationTime,
+    Color? maskColor,
+    Widget? maskWidget,
+    bool? debounce,
+    VoidCallback? onDismiss,
+    VoidCallback? onMask,
+    Duration? displayTime,
+    String? tag,
+    bool? backDismiss,
+    bool? keepSingle,
+    bool? permanent,
+    bool? useSystem,
+    bool? bindPage,
+    BuildContext? bindWidget,
+    Rect? ignoreArea,
+  }) {
+    return SmartDialog.show(
+      builder: builder,
+      controller: controller,
+      alignment: alignment,
+      clickMaskDismiss: clickMaskDismiss,
+      usePenetrate: usePenetrate,
+      useAnimation: useAnimation,
+      animationType: animationType,
+      nonAnimationTypes: nonAnimationTypes,
+      animationBuilder: animationBuilder,
+      animationTime: animationTime,
+      maskColor: maskColor,
+      maskWidget: maskWidget,
+      debounce: debounce,
+      onDismiss: onDismiss,
+      onMask: onMask,
+      displayTime: displayTime,
+      tag: tag,
+      backDismiss: backDismiss,
+      keepSingle: keepSingle,
+      permanent: permanent,
+      useSystem: useSystem,
+      bindPage: bindPage,
+      bindWidget: bindWidget,
+      ignoreArea: ignoreArea,
+    );
   }
 }
+
+/// 页面设置信息
+class PageSetting {
+  /// 全屏Dialog
+  final bool? fullscreenDialog;
+
+  /// 是否可截屏
+  final bool? allowSnapshotting;
+
+  /// 页面类型
+  final RouteType? routeType;
+
+  /// 业务参数
+  final Object? arguments;
+
+  PageSetting({
+    this.fullscreenDialog,
+    this.allowSnapshotting,
+    this.routeType = RouteType.cupertino,
+    this.arguments,
+  });
+
+  @override
+  String toString() => {
+        'fullscreenDialog': fullscreenDialog,
+        'allowSnapshotting': allowSnapshotting,
+        'routeType': routeType,
+        'arguments': arguments,
+      }.toString();
+}
+
+enum RouteType {
+  /// iOS样式路由
+  cupertino,
+
+  /// Android样式路由
+  material,
+
+  /// 普通路由(无动画效果)
+  normal,
+}

lib/router/my_router.dart

@@ -1,33 +1,12 @@
-import 'package:flutter/cupertino.dart';
 import 'package:lszlgl/page/login/login_page.dart';
 import 'package:lszlgl/page/main_tab_page.dart';
 import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_task_page.dart';
 import 'package:lszlgl/page/reap_step/reap_step_tab_page.dart';
-import 'package:lszlgl/page/unknow_page.dart';
 import 'package:lszlgl/page/user_center/account_manage_page.dart';
 import 'package:lszlgl/page/user_center/change_pwd_page.dart';
 import 'package:lszlgl/page/user_center/setting_page.dart';
 import 'package:lszlgl/router/my_navigator.dart';
 
-/// 创建页面函数
-typedef PageBuilder = Widget Function(BuildContext context, Object? args);
-
-/// 路由拦截
-RouteFactory rOnGenerateRoute = (RouteSettings settings) {
-  debugPrint('name:${settings.name} arguments:${settings.arguments} ');
-  // 获取对应名称的页面
-  PageBuilder? pageBuilder = rRoutes[settings.name];
-  // 未知页面
-  pageBuilder ??= (context, args) => UnknownPage(name: settings.name);
-  return CupertinoPageRoute(
-    settings: settings,
-    builder: (context) => pageBuilder!.call(
-      context,
-      settings.arguments,
-    ),
-  );
-};
-
 // 根页面
 const rLoginPage = '/';
 // 主页
@@ -43,7 +22,7 @@ const rReapStepTabPage = '/ReapStepTabPage';
 // 收获扦样任务
 const rReapSampleTaskPage = '/ReapSampleTaskPage';
 
-final Map<String, PageBuilder> rRoutes = {
+final Map<String, MyNavigatorBuilder> rRouteMap = {
   // 根页面
   rLoginPage: (context, args) => const LoginPage(),
   rMainTabPage: (context, args) => const MainTabPage(),
@@ -60,43 +39,45 @@ class MyRouter {
   /// 登录
   static void startLogin({bool popAll = false}) {
     if (popAll) {
-      Nav.pushAndRemoveUntil(rLoginPage, (route) => false);
+      MyNavigator.pushRemoveUntil(rLoginPage, (route) => false);
     } else {
-      Nav.push(rLoginPage);
+      MyNavigator.push(rLoginPage);
     }
   }
 
   /// 主页
   static void startMain({bool popAll = false}) {
     if (popAll) {
-      Nav.pushAndRemoveUntil(rMainTabPage, (route) => false);
+      MyNavigator.pushRemoveUntil(rMainTabPage, (route) => false);
     } else {
-      Nav.push(rMainTabPage);
+      MyNavigator.push(rMainTabPage);
     }
   }
 
   /// 账号管理
   static void startAccountManage() {
-    Nav.push(rAccountManagePage);
+    MyNavigator.push(rAccountManagePage);
   }
 
   /// 设置
   static void startSetting() {
-    Nav.push(rSettingPage);
+    MyNavigator.push(rSettingPage);
   }
 
   /// 修改密码
   static void startChangePwd() {
-    Nav.push(rChangePwdPage);
+    MyNavigator.push(rChangePwdPage);
   }
 
   /// 收获环节列表
   static void startReapStepList(ReapStepTabPageArgs args) {
-    Nav.push(rReapStepTabPage, args: args);
+    MyNavigator.push(rReapStepTabPage, args: args);
   }
 
   /// 收获扦样任务
   static void startReapSampleTask({bool detail = false}) {
-    Nav.push(rReapSampleTaskPage, args: detail);
+    MyNavigator.push(rReapSampleTaskPage, args: detail);
   }
 }
+
+

macos/Flutter/Flutter-Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"

macos/Flutter/Flutter-Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"

pubspec.lock

@@ -6,7 +6,7 @@ packages:
     description:
       name: async
       sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
   boolean_selector:
@@ -14,7 +14,7 @@ packages:
     description:
       name: boolean_selector
       sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   cached_network_image:
@@ -22,7 +22,7 @@ packages:
     description:
       name: cached_network_image
       sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.3.1"
   cached_network_image_platform_interface:
@@ -30,7 +30,7 @@ packages:
     description:
       name: cached_network_image_platform_interface
       sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
   cached_network_image_web:
@@ -38,7 +38,7 @@ packages:
     description:
       name: cached_network_image_web
       sha256: "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   card_swiper:
@@ -46,7 +46,7 @@ packages:
     description:
       name: card_swiper
       sha256: "21e52a144decbf0054e7cfed8bbe46fc89635e6c86b767eaccfe7d5aeba32528"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
   characters:
@@ -54,7 +54,7 @@ packages:
     description:
       name: characters
       sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
   clock:
@@ -62,7 +62,7 @@ packages:
     description:
       name: clock
       sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   collection:
@@ -70,7 +70,7 @@ packages:
     description:
       name: collection
       sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.18.0"
   crypto:
@@ -78,7 +78,7 @@ packages:
     description:
       name: crypto
       sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.3"
   cupertino_icons:
@@ -86,7 +86,7 @@ packages:
     description:
       name: cupertino_icons
       sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.6"
   date_format:
@@ -94,7 +94,7 @@ packages:
     description:
       name: date_format
       sha256: "8e5154ca363411847220c8cbc43afcf69c08e8debe40ba09d57710c25711760c"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.7"
   device_info_plus:
@@ -102,7 +102,7 @@ packages:
     description:
       name: device_info_plus
       sha256: "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "9.1.2"
   device_info_plus_platform_interface:
@@ -110,7 +110,7 @@ packages:
     description:
       name: device_info_plus_platform_interface
       sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
   fake_async:
@@ -118,7 +118,7 @@ packages:
     description:
       name: fake_async
       sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   ffi:
@@ -126,7 +126,7 @@ packages:
     description:
       name: ffi
       sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   file:
@@ -134,7 +134,7 @@ packages:
     description:
       name: file
       sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
   fixnum:
@@ -142,7 +142,7 @@ packages:
     description:
       name: fixnum
       sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
   flutter:
@@ -155,7 +155,7 @@ packages:
     description:
       name: flutter_cache_manager
       sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.3.1"
   flutter_keyboard_visibility:
@@ -163,7 +163,7 @@ packages:
     description:
       name: flutter_keyboard_visibility
       sha256: "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
   flutter_keyboard_visibility_linux:
@@ -171,7 +171,7 @@ packages:
     description:
       name: flutter_keyboard_visibility_linux
       sha256: "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   flutter_keyboard_visibility_macos:
@@ -179,7 +179,7 @@ packages:
     description:
       name: flutter_keyboard_visibility_macos
       sha256: c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   flutter_keyboard_visibility_platform_interface:
@@ -187,7 +187,7 @@ packages:
     description:
       name: flutter_keyboard_visibility_platform_interface
       sha256: e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   flutter_keyboard_visibility_web:
@@ -195,7 +195,7 @@ packages:
     description:
       name: flutter_keyboard_visibility_web
       sha256: d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   flutter_keyboard_visibility_windows:
@@ -203,7 +203,7 @@ packages:
     description:
       name: flutter_keyboard_visibility_windows
       sha256: fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   flutter_lints:
@@ -211,7 +211,7 @@ packages:
     description:
       name: flutter_lints
       sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
   flutter_localizations:
@@ -224,7 +224,7 @@ packages:
     description:
       name: flutter_smart_dialog
       sha256: e9ee69eeac16165d142f1974b4db05ca9846cffafb7c94674a38ec07d7e6cda1
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.9.6"
   flutter_test:
@@ -242,7 +242,7 @@ packages:
     description:
       name: http
       sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
   http_parser:
@@ -250,7 +250,7 @@ packages:
     description:
       name: http_parser
       sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
   intl:
@@ -258,7 +258,7 @@ packages:
     description:
       name: intl
       sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.18.1"
   lints:
@@ -266,7 +266,7 @@ packages:
     description:
       name: lints
       sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   matcher:
@@ -274,7 +274,7 @@ packages:
     description:
       name: matcher
       sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.12.16"
   material_color_utilities:
@@ -282,7 +282,7 @@ packages:
     description:
       name: material_color_utilities
       sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
   meta:
@@ -290,7 +290,7 @@ packages:
     description:
       name: meta
       sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
   octo_image:
@@ -298,7 +298,7 @@ packages:
     description:
       name: octo_image
       sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   package_info_plus:
@@ -306,7 +306,7 @@ packages:
     description:
       name: package_info_plus
       sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.2.0"
   package_info_plus_platform_interface:
@@ -314,7 +314,7 @@ packages:
     description:
       name: package_info_plus_platform_interface
       sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   path:
@@ -322,7 +322,7 @@ packages:
     description:
       name: path
       sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.3"
   path_provider:
@@ -330,7 +330,7 @@ packages:
     description:
       name: path_provider
       sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
   path_provider_android:
@@ -338,7 +338,7 @@ packages:
     description:
       name: path_provider_android
       sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.2"
   path_provider_foundation:
@@ -346,7 +346,7 @@ packages:
     description:
       name: path_provider_foundation
       sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.3.2"
   path_provider_linux:
@@ -354,7 +354,7 @@ packages:
     description:
       name: path_provider_linux
       sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.1"
   path_provider_platform_interface:
@@ -362,7 +362,7 @@ packages:
     description:
       name: path_provider_platform_interface
       sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
   path_provider_windows:
@@ -370,7 +370,7 @@ packages:
     description:
       name: path_provider_windows
       sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.1"
   platform:
@@ -378,7 +378,7 @@ packages:
     description:
       name: platform
       sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.4"
   plugin_platform_interface:
@@ -386,7 +386,7 @@ packages:
     description:
       name: plugin_platform_interface
       sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
   rxdart:
@@ -394,7 +394,7 @@ packages:
     description:
       name: rxdart
       sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.27.7"
   sky_engine:
@@ -407,7 +407,7 @@ packages:
     description:
       name: source_span
       sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
   sprintf:
@@ -415,7 +415,7 @@ packages:
     description:
       name: sprintf
       sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
   sqflite:
@@ -423,7 +423,7 @@ packages:
     description:
       name: sqflite
       sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.3.2"
   sqflite_common:
@@ -431,7 +431,7 @@ packages:
     description:
       name: sqflite_common
       sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.5.3"
   stack_trace:
@@ -439,7 +439,7 @@ packages:
     description:
       name: stack_trace
       sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.11.1"
   stream_channel:
@@ -447,7 +447,7 @@ packages:
     description:
       name: stream_channel
       sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
   string_scanner:
@@ -455,15 +455,31 @@ packages:
     description:
       name: string_scanner
       sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  syncfusion_flutter_core:
+    dependency: transitive
+    description:
+      name: syncfusion_flutter_core
+      sha256: e8580e201c7197feac830b501889e877796a9fabbe20dcdbe90a981603939101
+      url: "https://pub.dev"
+    source: hosted
+    version: "24.2.4"
+  syncfusion_flutter_datepicker:
+    dependency: "direct main"
+    description:
+      name: syncfusion_flutter_datepicker
+      sha256: "7d1ce5501c96ba1df68b833436f21e8ab46b7be5de0a99d7d8017fd3932cc0f5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "24.2.4"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
       sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.0+1"
   term_glyph:
@@ -471,7 +487,7 @@ packages:
     description:
       name: term_glyph
       sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test_api:
@@ -479,7 +495,7 @@ packages:
     description:
       name: test_api
       sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.6.1"
   typed_data:
@@ -487,7 +503,7 @@ packages:
     description:
       name: typed_data
       sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
   uuid:
@@ -495,7 +511,7 @@ packages:
     description:
       name: uuid
       sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.3.3"
   vector_math:
@@ -503,7 +519,7 @@ packages:
     description:
       name: vector_math
       sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
   web:
@@ -511,7 +527,7 @@ packages:
     description:
       name: web
       sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.3.0"
   win32:
@@ -519,7 +535,7 @@ packages:
     description:
       name: win32
       sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "5.2.0"
   win32_registry:
@@ -527,7 +543,7 @@ packages:
     description:
       name: win32_registry
       sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.2"
   xdg_directories:
@@ -535,7 +551,7 @@ packages:
     description:
       name: xdg_directories
       sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
 sdks: