4。9。4

@@ -16,17 +16,17 @@ if (flutterRoot == null) {
 
 
 
-def flutterVersionCode = "493"
+def flutterVersionCode = "494"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '493'
+    flutterVersionCode = '494'
 }
 
 
 
 
-def flutterVersionName = "4.9.3"
+def flutterVersionName = "4.9.4"
 if (flutterVersionName == null) {
-    flutterVersionName = '4.9.3' 
+    flutterVersionName = '4.9.4' 
 
 }
 

@@ -525,7 +525,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.9.3;
+				MARKETING_VERSION = 4.9.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -659,7 +659,7 @@
 				CURRENT_PROJECT_VERSION = 490;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
-				FLUTTER_BUILD_MODE = debug;
+				FLUTTER_BUILD_MODE = release;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -671,7 +671,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.9.3;
+				MARKETING_VERSION = 4.9.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -707,7 +707,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.9.3;
+				MARKETING_VERSION = 4.9.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";

@@ -168,9 +168,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
       )
       ..add(ChangeNotifierProvider<MyModel>(
         create: (_) => MyModel(),
-        child:ChangeNotifierProvider<StoreBaseIndoProvider>(
-        create: (_) => StoreBaseIndoProvider(),
-        child:  MyPage()),
+        child: ChangeNotifierProvider<StoreBaseIndoProvider>(
+            create: (_) => StoreBaseIndoProvider(), child: MyPage()),
       ));
     WidgetsBinding.instance.addPostFrameCallback((_) {
       initPlatformState();
@@ -936,6 +935,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
       case AppLifecycleState.paused:
         print('paused');
         needRefreshTemp = true;
+        // Utils.removeToast();
         break;
       case AppLifecycleState.detached:
         print('detached');

@@ -137,7 +137,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
                 ' 00:00:00';
         DateTime datenow = DateUtil.getDateTime(from);
         //比较相差的天数
-        outDay = edate.difference(datenow).inDays.toString();
+        int day = edate.difference(datenow).inDays;
+        outDay = day < 0 ? '0' : day.toString();
         // print(outDay);
       } else {
         outDay = '';
@@ -613,7 +614,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
                                             outDay,
                                             style: TextStyle(
                                                 fontWeight: FontWeight.bold,
-                                                color: MyColours.color_515151,
+                                                color: outDay != '' &&
+                                                        int.parse(outDay) <= 7
+                                                    ? MyColours.color_E34D59
+                                                    : MyColours.color_515151,
                                                 fontSize:
                                                     ScreenUtil().setSp(40)),
                                           ),

@@ -18,10 +18,12 @@ import 'package:fluwx/fluwx.dart';
 import 'package:one_key/pages/login/web_page.dart';
 import 'package:one_key/provider/my_model.dart';
 import 'package:one_key/provider/user_model.dart';
+import 'package:one_key/res/colors.dart';
 import 'package:one_key/utils/dialog_util.dart';
 import 'package:one_key/utils/lunar_calendar.dart';
 import 'package:one_key/utils/misc.dart';
 import 'package:one_key/route/navigator_util.dart';
+import 'package:one_key/utils/screen_util.dart';
 import 'package:one_key/widgets/loading.dart';
 import 'package:package_info/package_info.dart';
 import 'package:permission_handler/permission_handler.dart';
@@ -1123,7 +1125,30 @@ class Utils {
 
   static void showToast(String msg) {
     Fluttertoast.showToast(
-        msg: msg, toastLength: Toast.LENGTH_LONG, gravity: ToastGravity.CENTER);
+        msg: msg,
+        toastLength: Toast.LENGTH_LONG,
+        gravity: ToastGravity.CENTER);
+    // FToast().showToast(
+    //   positionedToastBuilder: (context,child){
+
+    //   },
+    //     child: Center(
+    //   child: Container(
+    //     height: w(48),
+    //     padding: EdgeInsets.symmetric(horizontal: w(10), vertical: w(15)),
+    //     decoration: BoxDecoration(
+    //         borderRadius: BorderRadius.circular(r(10)),
+    //         color: MyColours.color_2e000000),
+    //     child: Text(
+    //       msg,
+    //       style: TextStyle(color: MyColours.color_F8F9FD, fontSize: font(12)),
+    //     ),
+    //   ),
+    // ));
+  }
+
+  static void removeToast() {
+    Fluttertoast.cancel();
   }
 
   //本地图片资源路径

@@ -79,8 +79,8 @@ dependencies:
 #  日历
   table_calendar: ^2.2.1
 #  微信SDK
-  fluwx: ^3.9.0+2
-  # fluwx: ^3.13.1
+  # fluwx: ^3.9.0+2
+  fluwx: ^3.13.1
   # fluwx: ^4.2.5
   #网页，短信，电话
   # url_launcher: ^5.4.2