xt / Flutter-ReserveApp · Commits

Go to a project

Commit 0aef718779625b303b06b1485d5e14612177968a

Authored by wdn127929
1 parent 06c62a06
build: skipped

4。9。4

Inline Side-by-side
Showing 6 changed files with 45 additions and 16 deletions
@@ -16,17 +16,17 @@ if (flutterRoot == null) { @@ -16,17 +16,17 @@ if (flutterRoot == null) {
16 16
17 17
18 18
19 -def flutterVersionCode = "493" 19 +def flutterVersionCode = "494"
20 if (flutterVersionCode == null) { 20 if (flutterVersionCode == null) {
21 - flutterVersionCode = '493' 21 + flutterVersionCode = '494'
22 } 22 }
23 23
24 24
25 25
26 26
27 -def flutterVersionName = "4.9.3" 27 +def flutterVersionName = "4.9.4"
28 if (flutterVersionName == null) { 28 if (flutterVersionName == null) {
29 - flutterVersionName = '4.9.3' 29 + flutterVersionName = '4.9.4'
30 30
31 } 31 }
32 32
@@ -525,7 +525,7 @@ @@ -525,7 +525,7 @@
525 "$(inherited)", 525 "$(inherited)",
526 "$(PROJECT_DIR)/Flutter", 526 "$(PROJECT_DIR)/Flutter",
527 ); 527 );
528 - MARKETING_VERSION = 4.9.3; 528 + MARKETING_VERSION = 4.9.4;
529 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 529 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
530 PRODUCT_NAME = Runner; 530 PRODUCT_NAME = Runner;
531 PROVISIONING_PROFILE_SPECIFIER = ""; 531 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -659,7 +659,7 @@ @@ -659,7 +659,7 @@
659 CURRENT_PROJECT_VERSION = 490; 659 CURRENT_PROJECT_VERSION = 490;
660 DEVELOPMENT_TEAM = 8J59HM8B82; 660 DEVELOPMENT_TEAM = 8J59HM8B82;
661 ENABLE_BITCODE = NO; 661 ENABLE_BITCODE = NO;
662 - FLUTTER_BUILD_MODE = debug; 662 + FLUTTER_BUILD_MODE = release;
663 FRAMEWORK_SEARCH_PATHS = ( 663 FRAMEWORK_SEARCH_PATHS = (
664 "$(inherited)", 664 "$(inherited)",
665 "$(PROJECT_DIR)/Flutter", 665 "$(PROJECT_DIR)/Flutter",
@@ -671,7 +671,7 @@ @@ -671,7 +671,7 @@
671 "$(inherited)", 671 "$(inherited)",
672 "$(PROJECT_DIR)/Flutter", 672 "$(PROJECT_DIR)/Flutter",
673 ); 673 );
674 - MARKETING_VERSION = 4.9.3; 674 + MARKETING_VERSION = 4.9.4;
675 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 675 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
676 PRODUCT_NAME = Runner; 676 PRODUCT_NAME = Runner;
677 PROVISIONING_PROFILE_SPECIFIER = ""; 677 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -707,7 +707,7 @@ @@ -707,7 +707,7 @@
707 "$(inherited)", 707 "$(inherited)",
708 "$(PROJECT_DIR)/Flutter", 708 "$(PROJECT_DIR)/Flutter",
709 ); 709 );
710 - MARKETING_VERSION = 4.9.3; 710 + MARKETING_VERSION = 4.9.4;
711 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 711 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
712 PRODUCT_NAME = Runner; 712 PRODUCT_NAME = Runner;
713 PROVISIONING_PROFILE_SPECIFIER = ""; 713 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -168,9 +168,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -168,9 +168,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
168 ) 168 )
169 ..add(ChangeNotifierProvider<MyModel>( 169 ..add(ChangeNotifierProvider<MyModel>(
170 create: (_) => MyModel(), 170 create: (_) => MyModel(),
171 - child:ChangeNotifierProvider<StoreBaseIndoProvider>(  
172 - create: (_) => StoreBaseIndoProvider(),  
173 - child: MyPage()), 171 + child: ChangeNotifierProvider<StoreBaseIndoProvider>(
  172 + create: (_) => StoreBaseIndoProvider(), child: MyPage()),
174 )); 173 ));
175 WidgetsBinding.instance.addPostFrameCallback((_) { 174 WidgetsBinding.instance.addPostFrameCallback((_) {
176 initPlatformState(); 175 initPlatformState();
@@ -936,6 +935,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -936,6 +935,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
936 case AppLifecycleState.paused: 935 case AppLifecycleState.paused:
937 print('paused'); 936 print('paused');
938 needRefreshTemp = true; 937 needRefreshTemp = true;
  938 + // Utils.removeToast();
939 break; 939 break;
940 case AppLifecycleState.detached: 940 case AppLifecycleState.detached:
941 print('detached'); 941 print('detached');
@@ -137,7 +137,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -137,7 +137,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
137 ' 00:00:00'; 137 ' 00:00:00';
138 DateTime datenow = DateUtil.getDateTime(from); 138 DateTime datenow = DateUtil.getDateTime(from);
139 //比较相差的天数 139 //比较相差的天数
140 - outDay = edate.difference(datenow).inDays.toString(); 140 + int day = edate.difference(datenow).inDays;
  141 + outDay = day < 0 ? '0' : day.toString();
141 // print(outDay); 142 // print(outDay);
142 } else { 143 } else {
143 outDay = ''; 144 outDay = '';
@@ -613,7 +614,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -613,7 +614,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
613 outDay, 614 outDay,
614 style: TextStyle( 615 style: TextStyle(
615 fontWeight: FontWeight.bold, 616 fontWeight: FontWeight.bold,
616 - color: MyColours.color_515151, 617 + color: outDay != '' &&
  618 + int.parse(outDay) <= 7
  619 + ? MyColours.color_E34D59
  620 + : MyColours.color_515151,
617 fontSize: 621 fontSize:
618 ScreenUtil().setSp(40)), 622 ScreenUtil().setSp(40)),
619 ), 623 ),
@@ -18,10 +18,12 @@ import 'package:fluwx/fluwx.dart'; @@ -18,10 +18,12 @@ import 'package:fluwx/fluwx.dart';
18 import 'package:one_key/pages/login/web_page.dart'; 18 import 'package:one_key/pages/login/web_page.dart';
19 import 'package:one_key/provider/my_model.dart'; 19 import 'package:one_key/provider/my_model.dart';
20 import 'package:one_key/provider/user_model.dart'; 20 import 'package:one_key/provider/user_model.dart';
  21 +import 'package:one_key/res/colors.dart';
21 import 'package:one_key/utils/dialog_util.dart'; 22 import 'package:one_key/utils/dialog_util.dart';
22 import 'package:one_key/utils/lunar_calendar.dart'; 23 import 'package:one_key/utils/lunar_calendar.dart';
23 import 'package:one_key/utils/misc.dart'; 24 import 'package:one_key/utils/misc.dart';
24 import 'package:one_key/route/navigator_util.dart'; 25 import 'package:one_key/route/navigator_util.dart';
  26 +import 'package:one_key/utils/screen_util.dart';
25 import 'package:one_key/widgets/loading.dart'; 27 import 'package:one_key/widgets/loading.dart';
26 import 'package:package_info/package_info.dart'; 28 import 'package:package_info/package_info.dart';
27 import 'package:permission_handler/permission_handler.dart'; 29 import 'package:permission_handler/permission_handler.dart';
@@ -1123,7 +1125,30 @@ class Utils { @@ -1123,7 +1125,30 @@ class Utils {
1123 1125
1124 static void showToast(String msg) { 1126 static void showToast(String msg) {
1125 Fluttertoast.showToast( 1127 Fluttertoast.showToast(
1126 - msg: msg, toastLength: Toast.LENGTH_LONG, gravity: ToastGravity.CENTER); 1128 + msg: msg,
  1129 + toastLength: Toast.LENGTH_LONG,
  1130 + gravity: ToastGravity.CENTER);
  1131 + // FToast().showToast(
  1132 + // positionedToastBuilder: (context,child){
  1133 +
  1134 + // },
  1135 + // child: Center(
  1136 + // child: Container(
  1137 + // height: w(48),
  1138 + // padding: EdgeInsets.symmetric(horizontal: w(10), vertical: w(15)),
  1139 + // decoration: BoxDecoration(
  1140 + // borderRadius: BorderRadius.circular(r(10)),
  1141 + // color: MyColours.color_2e000000),
  1142 + // child: Text(
  1143 + // msg,
  1144 + // style: TextStyle(color: MyColours.color_F8F9FD, fontSize: font(12)),
  1145 + // ),
  1146 + // ),
  1147 + // ));
  1148 + }
  1149 +
  1150 + static void removeToast() {
  1151 + Fluttertoast.cancel();
1127 } 1152 }
1128 1153
1129 //本地图片资源路径 1154 //本地图片资源路径
@@ -79,8 +79,8 @@ dependencies: @@ -79,8 +79,8 @@ dependencies:
79 # 日历 79 # 日历
80 table_calendar: ^2.2.1 80 table_calendar: ^2.2.1
81 # 微信SDK 81 # 微信SDK
82 - fluwx: ^3.9.0+2  
83 - # fluwx: ^3.13.1 82 + # fluwx: ^3.9.0+2
  83 + fluwx: ^3.13.1
84 # fluwx: ^4.2.5 84 # fluwx: ^4.2.5
85 #网页，短信，电话 85 #网页，短信，电话
86 # url_launcher: ^5.4.2 86 # url_launcher: ^5.4.2