xt / Flutter-ReserveApp · Commits

Go to a project

Commit ef43b4a874812322094a63b7184350e88a8f5918

Authored by wdn127929
2 parents c9656943 3b18793b
build: skipped

合并5.4.2线上版本

Inline Side-by-side
Showing 5 changed files with 22 additions and 17 deletions
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 </provider> 132 </provider>
133 <meta-data 133 <meta-data
134 android:name="com.amap.api.v2.apikey" 134 android:name="com.amap.api.v2.apikey"
135 - android:value="13464ddadd6a5d825e79f90e10ba72d2"/> 135 + android:value="378180aa66e6d13fddfee5fd7a127d4f"/>
136 136
137 <activity 137 <activity
138 android:name="com.yalantis.ucrop.UCropActivity" 138 android:name="com.yalantis.ucrop.UCropActivity"
@@ -553,9 +553,8 @@ @@ -553,9 +553,8 @@
553 CLANG_ENABLE_MODULES = YES; 553 CLANG_ENABLE_MODULES = YES;
554 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 554 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
555 CODE_SIGN_IDENTITY = "Apple Development"; 555 CODE_SIGN_IDENTITY = "Apple Development";
556 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";  
557 - CODE_SIGN_STYLE = Manual;  
558 - CURRENT_PROJECT_VERSION = 5424; 556 + CODE_SIGN_STYLE = Automatic;
  557 + CURRENT_PROJECT_VERSION = 542;
559 DEVELOPMENT_TEAM = 8J59HM8B82; 558 DEVELOPMENT_TEAM = 8J59HM8B82;
560 ENABLE_BITCODE = NO; 559 ENABLE_BITCODE = NO;
561 FLUTTER_BUILD_MODE = release; 560 FLUTTER_BUILD_MODE = release;
@@ -705,9 +704,8 @@ @@ -705,9 +704,8 @@
705 CLANG_ENABLE_MODULES = YES; 704 CLANG_ENABLE_MODULES = YES;
706 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 705 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
707 CODE_SIGN_IDENTITY = "Apple Development"; 706 CODE_SIGN_IDENTITY = "Apple Development";
708 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";  
709 - CODE_SIGN_STYLE = Manual;  
710 - CURRENT_PROJECT_VERSION = 5424; 707 + CODE_SIGN_STYLE = Automatic;
  708 + CURRENT_PROJECT_VERSION = 542;
711 DEVELOPMENT_TEAM = 8J59HM8B82; 709 DEVELOPMENT_TEAM = 8J59HM8B82;
712 ENABLE_BITCODE = NO; 710 ENABLE_BITCODE = NO;
713 FLUTTER_BUILD_MODE = debug; 711 FLUTTER_BUILD_MODE = debug;
@@ -748,9 +746,8 @@ @@ -748,9 +746,8 @@
748 CLANG_ENABLE_MODULES = YES; 746 CLANG_ENABLE_MODULES = YES;
749 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 747 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
750 CODE_SIGN_IDENTITY = "Apple Development"; 748 CODE_SIGN_IDENTITY = "Apple Development";
751 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";  
752 - CODE_SIGN_STYLE = Manual;  
753 - CURRENT_PROJECT_VERSION = 5424; 749 + CODE_SIGN_STYLE = Automatic;
  750 + CURRENT_PROJECT_VERSION = 542;
754 DEVELOPMENT_TEAM = 8J59HM8B82; 751 DEVELOPMENT_TEAM = 8J59HM8B82;
755 ENABLE_BITCODE = NO; 752 ENABLE_BITCODE = NO;
756 FLUTTER_BUILD_MODE = release; 753 FLUTTER_BUILD_MODE = release;
@@ -226,11 +226,11 @@ class MyAppState extends State<MyApp> { @@ -226,11 +226,11 @@ class MyAppState extends State<MyApp> {
226 await AmapLocation.instance.updatePrivacyShow(true); 226 await AmapLocation.instance.updatePrivacyShow(true);
227 await AmapLocation.instance.updatePrivacyAgree(true); 227 await AmapLocation.instance.updatePrivacyAgree(true);
228 await AmapService.instance.init( 228 await AmapService.instance.init(
229 - iosKey: '24fe3a700e69114a4328d4e46823dcda',  
230 - androidKey: '13464ddadd6a5d825e79f90e10ba72d2'); 229 + iosKey: 'e402b13a251d4e33fad022b13d47b8f4',
  230 + androidKey: '378180aa66e6d13fddfee5fd7a127d4f');
231 231
232 await AmapLocation.instance.init( 232 await AmapLocation.instance.init(
233 - iosKey: '24fe3a700e69114a4328d4e46823dcda', 233 + iosKey: 'e402b13a251d4e33fad022b13d47b8f4',
234 ); 234 );
235 } 235 }
236 236
@@ -105,11 +105,11 @@ class _FirstPageState extends State<FirstPage> { @@ -105,11 +105,11 @@ class _FirstPageState extends State<FirstPage> {
105 await AmapLocation.instance.updatePrivacyShow(true); 105 await AmapLocation.instance.updatePrivacyShow(true);
106 await AmapLocation.instance.updatePrivacyAgree(true); 106 await AmapLocation.instance.updatePrivacyAgree(true);
107 await AmapService.instance.init( 107 await AmapService.instance.init(
108 - iosKey: '24fe3a700e69114a4328d4e46823dcda',  
109 - androidKey: '13464ddadd6a5d825e79f90e10ba72d2'); 108 + iosKey: 'e402b13a251d4e33fad022b13d47b8f4',
  109 + androidKey: '378180aa66e6d13fddfee5fd7a127d4f');
110 110
111 await AmapLocation.instance.init( 111 await AmapLocation.instance.init(
112 - iosKey: '24fe3a700e69114a4328d4e46823dcda', 112 + iosKey: 'e402b13a251d4e33fad022b13d47b8f4',
113 ); 113 );
114 } 114 }
115 115
@@ -159,7 +159,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -159,7 +159,7 @@ class TableManagerPageState extends State<TableManagerPage> {
159 159
160 String dateText = ""; //当前显示日期时间 160 String dateText = ""; //当前显示日期时间
161 String dateShowNow = ""; //今天，明天，后天 161 String dateShowNow = ""; //今天，明天，后天
162 - int currTimeIndex = 2; //当前选中时间段 162 + int currTimeIndex; //当前选中时间段
163 String morning = "00:00-00:00"; //早市时间段 163 String morning = "00:00-00:00"; //早市时间段
164 String noon = "00:00-00:00"; //午市时间段 164 String noon = "00:00-00:00"; //午市时间段
165 String night = "00:00-00:00"; //晚市时间段 165 String night = "00:00-00:00"; //晚市时间段
@@ -2681,6 +2681,10 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -2681,6 +2681,10 @@ class TableManagerPageState extends State<TableManagerPage> {
2681 radius: ScreenUtil().setWidth(8), 2681 radius: ScreenUtil().setWidth(8),
2682 isBold: false, 2682 isBold: false,
2683 onPressed: () async { 2683 onPressed: () async {
  2684 + if(currTimeIndex == null){
  2685 + Utils.showToast('请选择餐段或检查您的网络！');
  2686 + return;
  2687 + }
2684 // _onlyReserve(); 2688 // _onlyReserve();
2685 Loading.showLoading( 2689 Loading.showLoading(
2686 context, 2690 context,
@@ -2731,6 +2735,10 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -2731,6 +2735,10 @@ class TableManagerPageState extends State<TableManagerPage> {
2731 radius: ScreenUtil().setWidth(8), 2735 radius: ScreenUtil().setWidth(8),
2732 isBold: false, 2736 isBold: false,
2733 onPressed: () async { 2737 onPressed: () async {
  2738 + if(currTimeIndex == null){
  2739 + Utils.showToast('请选择餐段或检查您的网络！');
  2740 + return;
  2741 + }
2734 Loading.showLoading( 2742 Loading.showLoading(
2735 context, 2743 context,
2736 ); 2744 );