xt / Flutter-ReserveApp · Commits

Go to a project

Commit 22d258a2966500a6bcc725a89fa53d832a387279

Authored by weixin_45529955
1 parent fdb5a73a

我的页面结构重组 之前 提交分支

Inline Side-by-side
Showing 3 changed files with 25 additions and 12 deletions
@@ -355,10 +355,14 @@ @@ -355,10 +355,14 @@
355 inputFileListPaths = ( 355 inputFileListPaths = (
356 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", 356 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
357 ); 357 );
  358 + inputPaths = (
  359 + );
358 name = "[CP] Embed Pods Frameworks"; 360 name = "[CP] Embed Pods Frameworks";
359 outputFileListPaths = ( 361 outputFileListPaths = (
360 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", 362 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
361 ); 363 );
  364 + outputPaths = (
  365 + );
362 runOnlyForDeploymentPostprocessing = 0; 366 runOnlyForDeploymentPostprocessing = 0;
363 shellPath = /bin/sh; 367 shellPath = /bin/sh;
364 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; 368 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -372,10 +376,14 @@ @@ -372,10 +376,14 @@
372 inputFileListPaths = ( 376 inputFileListPaths = (
373 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", 377 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
374 ); 378 );
  379 + inputPaths = (
  380 + );
375 name = "[CP] Copy Pods Resources"; 381 name = "[CP] Copy Pods Resources";
376 outputFileListPaths = ( 382 outputFileListPaths = (
377 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", 383 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
378 ); 384 );
  385 + outputPaths = (
  386 + );
379 runOnlyForDeploymentPostprocessing = 0; 387 runOnlyForDeploymentPostprocessing = 0;
380 shellPath = /bin/sh; 388 shellPath = /bin/sh;
381 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; 389 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -527,7 +535,7 @@ @@ -527,7 +535,7 @@
527 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
528 CLANG_ENABLE_MODULES = YES; 536 CLANG_ENABLE_MODULES = YES;
529 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 537 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
530 - CURRENT_PROJECT_VERSION = 571; 538 + CURRENT_PROJECT_VERSION = 5803;
531 DEVELOPMENT_TEAM = 8J59HM8B82; 539 DEVELOPMENT_TEAM = 8J59HM8B82;
532 ENABLE_BITCODE = NO; 540 ENABLE_BITCODE = NO;
533 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; 541 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -537,7 +545,7 @@ @@ -537,7 +545,7 @@
537 "$(inherited)", 545 "$(inherited)",
538 "@executable_path/Frameworks", 546 "@executable_path/Frameworks",
539 ); 547 );
540 - MARKETING_VERSION = 5.7.1; 548 + MARKETING_VERSION = 5.8.0;
541 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 549 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
542 PRODUCT_NAME = "$(TARGET_NAME)"; 550 PRODUCT_NAME = "$(TARGET_NAME)";
543 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 551 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -712,7 +720,7 @@ @@ -712,7 +720,7 @@
712 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 720 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
713 CLANG_ENABLE_MODULES = YES; 721 CLANG_ENABLE_MODULES = YES;
714 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 722 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
715 - CURRENT_PROJECT_VERSION = 571; 723 + CURRENT_PROJECT_VERSION = 5803;
716 DEVELOPMENT_TEAM = 8J59HM8B82; 724 DEVELOPMENT_TEAM = 8J59HM8B82;
717 ENABLE_BITCODE = NO; 725 ENABLE_BITCODE = NO;
718 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; 726 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -722,7 +730,7 @@ @@ -722,7 +730,7 @@
722 "$(inherited)", 730 "$(inherited)",
723 "@executable_path/Frameworks", 731 "@executable_path/Frameworks",
724 ); 732 );
725 - MARKETING_VERSION = 5.7.1; 733 + MARKETING_VERSION = 5.8.0;
726 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 734 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
727 PRODUCT_NAME = "$(TARGET_NAME)"; 735 PRODUCT_NAME = "$(TARGET_NAME)";
728 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 736 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -740,7 +748,7 @@ @@ -740,7 +748,7 @@
740 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 748 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
741 CLANG_ENABLE_MODULES = YES; 749 CLANG_ENABLE_MODULES = YES;
742 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 750 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
743 - CURRENT_PROJECT_VERSION = 571; 751 + CURRENT_PROJECT_VERSION = 5803;
744 DEVELOPMENT_TEAM = 8J59HM8B82; 752 DEVELOPMENT_TEAM = 8J59HM8B82;
745 ENABLE_BITCODE = NO; 753 ENABLE_BITCODE = NO;
746 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; 754 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -750,7 +758,7 @@ @@ -750,7 +758,7 @@
750 "$(inherited)", 758 "$(inherited)",
751 "@executable_path/Frameworks", 759 "@executable_path/Frameworks",
752 ); 760 );
753 - MARKETING_VERSION = 5.7.1; 761 + MARKETING_VERSION = 5.8.0;
754 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 762 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
755 PRODUCT_NAME = "$(TARGET_NAME)"; 763 PRODUCT_NAME = "$(TARGET_NAME)";
756 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 764 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -2,6 +2,12 @@ @@ -2,6 +2,12 @@
2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 <plist version="1.0"> 3 <plist version="1.0">
4 <dict> 4 <dict>
  5 + <key>NSLocalNetworkUsageDescription</key>
  6 + <string></string>
  7 + <key>NSBonjourServices</key>
  8 + <array>
  9 + <string></string>
  10 + </array>
5 <key>CADisableMinimumFrameDurationOnPhone</key> 11 <key>CADisableMinimumFrameDurationOnPhone</key>
6 <true/> 12 <true/>
7 <key>CFBundleAllowMixedLocalizations</key> 13 <key>CFBundleAllowMixedLocalizations</key>
@@ -204,15 +204,14 @@ class BeforePayJson { @@ -204,15 +204,14 @@ class BeforePayJson {
204 : null; 204 : null;
205 } 205 }
206 206
207 - if (json['old'] is Map) {  
208 - oldUser = json['old'] != null ? new NewUser.fromJson(json['old']) : null; 207 + if (json['old'] is Map) {
  208 + oldUser = json['old'] != null ? new NewUser.fromJson(json['old']) : null;
209 } else { 209 } else {
210 -  
211 -  
212 - oldUser = json['old'] != null ? new NewUser.fromJson(jsonDecode(json['old'])) : null; 210 + oldUser = json['old'] != null
  211 + ? new NewUser.fromJson(jsonDecode(json['old']))
  212 + : null;
213 } 213 }
214 214
215 -  
216 isOld = json['is_old']; 215 isOld = json['is_old'];
217 isNew = json['is_new']; 216 isNew = json['is_new'];
218 } 217 }