feats

lib/main.dart

@@ -30,7 +30,7 @@ class MyApp extends StatelessWidget {
       designSize: const Size(375, 812),
       minTextAdapt: true,
       splitScreenMode: true,
-      builder: (_) {
+      builder: (context , child) {
         return GetMaterialApp(
           localizationsDelegates: const [
             GlobalMaterialLocalizations.delegate,

lib/widgets/Modal.dart

@@ -1,3 +1,5 @@
+import 'dart:ffi';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
@@ -9,26 +11,37 @@ typedef ModalFunc = dynamic Function();
 /// func 函数如果返回 bool 值, 则只有 true 的情况下才默认关闭弹窗
 /// 如果返回 Future , 则只有正常结束的时候 才关闭弹窗
 /// 其余情况, 都默认关闭弹窗
-void _handleFunc(ModalFunc? func) {
+void _handleFunc(ModalFunc? func, bool lazy) {
+  // 是否立即关闭
+  _close (bool canClose) {
+    if (canClose) {
+      _closeModal();
+    }
+  };
+
+  // 如果 lazy 是 true 则不会立即关闭
+  _close(!lazy);
+
   if (null != func) {
     dynamic res = func();
     if (res.runtimeType == bool) {
-      if (res) {
-        _closeModal();
+      if (res && lazy) {
+        _close(lazy);
       }
     } else if (res is Future) {
-      res.then((_) => _closeModal());
+      res.then((_) => _close(lazy));
     } else {
-      _closeModal();
+      _close(lazy);
     }
   } else {
-    _closeModal();
+    _close(lazy);
   }
 }
 
 /// 打开一个 dialog
 void showDialog(
     {required String title,
+      lazy = false,
     String? message,
     Widget? content,
     ModalFunc? onConfirm,
@@ -38,14 +51,15 @@ void showDialog(
     title: title,
     message: message,
     content: content,
-    onConfirm: () => _handleFunc(onConfirm),
-    onCancel: () => _handleFunc(onCancel),
+    onConfirm: () => _handleFunc(onConfirm, lazy),
+    onCancel: () => _handleFunc(onCancel, lazy),
   ));
 }
 
 /// 打开一个 alert
 void showAlert(
     {required String title,
+      bool lazy = false,
     String? message,
     Widget? content,
     ModalFunc? onConfirm}) {
@@ -54,7 +68,7 @@ void showAlert(
     title: title,
     message: message,
     content: content,
-    onConfirm: () => _handleFunc(onConfirm),
+    onConfirm: () => _handleFunc(onConfirm, lazy),
   ));
 }
 

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "39.0.0"
+    version: "40.0.0"
   amap_flutter_base:
     dependency: transitive
     description:
@@ -35,14 +35,14 @@ packages:
       name: analyzer
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.0"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   async:
     dependency: transitive
     description:
@@ -168,7 +168,7 @@ packages:
       name: ffi
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
   file:
     dependency: transitive
     description:
@@ -185,7 +185,7 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_easyloading
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.3"
   flutter_lints:
@@ -206,25 +206,21 @@ packages:
       name: flutter_plugin_android_lifecycle
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   flutter_screenutil:
     dependency: "direct main"
     description:
       name: flutter_screenutil
       url: "https://pub.flutter-io.cn"
     source: hosted
-<<<<<<< HEAD
-    version: "5.4.0+1"
+    version: "5.5.3+1"
   flutter_spinkit:
     dependency: transitive
     description:
       name: flutter_spinkit
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.1.0"
-=======
-    version: "5.5.2"
->>>>>>> b052c991e6c96dc1b28c3fa153d55d36d0e0272a
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -269,7 +265,7 @@ packages:
       name: http_parser
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.1"
   intl:
     dependency: transitive
     description:
@@ -353,49 +349,49 @@ packages:
       name: path_provider
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.9"
+    version: "2.0.10"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.13"
+    version: "2.0.14"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.8"
+    version: "2.0.9"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.6"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   permission_handler:
     dependency: "direct main"
     description:
@@ -575,7 +571,7 @@ packages:
       name: yaml
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
 sdks:
   dart: ">=2.16.1 <3.0.0"
   flutter: ">=2.8.1"