xt / Flutter-ReserveApp · Commits

Go to a project

Commit 48c1d68d095ee163828f457a7588a593d4098425

Authored by wdn127929
1 parent 8d98ef70

订座详情页修改金额和人数键盘上方自定义 完成 按钮 方法里没有让输入框失去焦点,导致获得焦点方法重复执行

Inline Side-by-side
Showing 4 changed files with 17 additions and 24 deletions
@@ -83,8 +83,8 @@ android { @@ -83,8 +83,8 @@ android {
83 83
84 ndk { 84 ndk {
85 //选择要添加的对应 cpu 类型的 .so 库。 85 //选择要添加的对应 cpu 类型的 .so 库。
86 - abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位  
87 - // abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64' 86 + // abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位
  87 + abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
88 } 88 }
89 89
90 lintOptions { 90 lintOptions {
@@ -449,7 +449,7 @@ @@ -449,7 +449,7 @@
449 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 449 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
450 CLANG_ENABLE_MODULES = YES; 450 CLANG_ENABLE_MODULES = YES;
451 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 451 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
452 - CURRENT_PROJECT_VERSION = 554; 452 + CURRENT_PROJECT_VERSION = 5550;
453 DEVELOPMENT_TEAM = 8J59HM8B82; 453 DEVELOPMENT_TEAM = 8J59HM8B82;
454 ENABLE_BITCODE = NO; 454 ENABLE_BITCODE = NO;
455 INFOPLIST_FILE = Runner/Info.plist; 455 INFOPLIST_FILE = Runner/Info.plist;
@@ -458,7 +458,7 @@ @@ -458,7 +458,7 @@
458 "$(inherited)", 458 "$(inherited)",
459 "@executable_path/Frameworks", 459 "@executable_path/Frameworks",
460 ); 460 );
461 - MARKETING_VERSION = 5.5.4; 461 + MARKETING_VERSION = 5.5.5;
462 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 462 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
463 PRODUCT_NAME = "$(TARGET_NAME)"; 463 PRODUCT_NAME = "$(TARGET_NAME)";
464 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 464 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -632,7 +632,7 @@ @@ -632,7 +632,7 @@
632 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 632 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
633 CLANG_ENABLE_MODULES = YES; 633 CLANG_ENABLE_MODULES = YES;
634 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 634 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
635 - CURRENT_PROJECT_VERSION = 554; 635 + CURRENT_PROJECT_VERSION = 5550;
636 DEVELOPMENT_TEAM = 8J59HM8B82; 636 DEVELOPMENT_TEAM = 8J59HM8B82;
637 ENABLE_BITCODE = NO; 637 ENABLE_BITCODE = NO;
638 INFOPLIST_FILE = Runner/Info.plist; 638 INFOPLIST_FILE = Runner/Info.plist;
@@ -641,7 +641,7 @@ @@ -641,7 +641,7 @@
641 "$(inherited)", 641 "$(inherited)",
642 "@executable_path/Frameworks", 642 "@executable_path/Frameworks",
643 ); 643 );
644 - MARKETING_VERSION = 5.5.4; 644 + MARKETING_VERSION = 5.5.5;
645 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 645 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
646 PRODUCT_NAME = "$(TARGET_NAME)"; 646 PRODUCT_NAME = "$(TARGET_NAME)";
647 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 647 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -658,7 +658,7 @@ @@ -658,7 +658,7 @@
658 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 658 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
659 CLANG_ENABLE_MODULES = YES; 659 CLANG_ENABLE_MODULES = YES;
660 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 660 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
661 - CURRENT_PROJECT_VERSION = 554; 661 + CURRENT_PROJECT_VERSION = 5550;
662 DEVELOPMENT_TEAM = 8J59HM8B82; 662 DEVELOPMENT_TEAM = 8J59HM8B82;
663 ENABLE_BITCODE = NO; 663 ENABLE_BITCODE = NO;
664 INFOPLIST_FILE = Runner/Info.plist; 664 INFOPLIST_FILE = Runner/Info.plist;
@@ -667,7 +667,7 @@ @@ -667,7 +667,7 @@
667 "$(inherited)", 667 "$(inherited)",
668 "@executable_path/Frameworks", 668 "@executable_path/Frameworks",
669 ); 669 );
670 - MARKETING_VERSION = 5.5.4; 670 + MARKETING_VERSION = 5.5.5;
671 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 671 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
672 PRODUCT_NAME = "$(TARGET_NAME)"; 672 PRODUCT_NAME = "$(TARGET_NAME)";
673 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 673 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
This diff could not be displayed because it is too large.
@@ -3278,25 +3278,18 @@ class Utils { @@ -3278,25 +3278,18 @@ class Utils {
3278 static _getDsoltStrShow(String ddateSolt, String mname, {bool isCan = true}) { 3278 static _getDsoltStrShow(String ddateSolt, String mname, {bool isCan = true}) {
3279 String dsoltStr = ''; 3279 String dsoltStr = '';
3280 if (!isCan) { 3280 if (!isCan) {
3281 - if (mname == '早餐' || mname == '午餐' || mname == '晚餐') {  
3282 - dsoltStr = ddateSolt == '1'  
3283 - ? '早上'  
3284 - : ddateSolt == '2'  
3285 - ? '中午'  
3286 - : '晚上';  
3287 - } else { 3281 + if (mname == '早餐') {
  3282 + mname ='早上';
  3283 + } else if (mname == '午餐') {
  3284 + mname ='中午';
  3285 + } else if (mname == '晚餐') {
  3286 + mname = '晚上';
  3287 + }
3288 dsoltStr = mname; 3288 dsoltStr = mname;
3289 - }  
3290 } else { 3289 } else {
3291 - if (mname == '早餐' || mname == '午餐' || mname == '晚餐') {  
3292 - dsoltStr = ddateSolt == '1'  
3293 - ? '早餐'  
3294 - : ddateSolt == '2'  
3295 - ? '午餐'  
3296 - : '晚餐';  
3297 - } else { 3290 +
3298 dsoltStr = mname; 3291 dsoltStr = mname;
3299 - } 3292 +
3300 } 3293 }
3301 return dsoltStr; 3294 return dsoltStr;
3302 } 3295 }