xt / Flutter-ReserveApp · Commits

Go to a project

Commit 6a3bca0d13b87a9427754ae0d7a7bd43a211379a

Authored by weixin_45529955
1 parent 5962fc6b
build: skipped

needhistory 全局变量和局部变量同名引起的bug

Inline Side-by-side
Showing 2 changed files with 24 additions and 12 deletions
@@ -527,7 +527,7 @@ @@ -527,7 +527,7 @@
527 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 527 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
528 CLANG_ENABLE_MODULES = YES; 528 CLANG_ENABLE_MODULES = YES;
529 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 529 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
530 - CURRENT_PROJECT_VERSION = 564; 530 + CURRENT_PROJECT_VERSION = 5654;
531 DEVELOPMENT_TEAM = 8J59HM8B82; 531 DEVELOPMENT_TEAM = 8J59HM8B82;
532 ENABLE_BITCODE = NO; 532 ENABLE_BITCODE = NO;
533 INFOPLIST_FILE = Runner/Info.plist; 533 INFOPLIST_FILE = Runner/Info.plist;
@@ -536,7 +536,7 @@ @@ -536,7 +536,7 @@
536 "$(inherited)", 536 "$(inherited)",
537 "@executable_path/Frameworks", 537 "@executable_path/Frameworks",
538 ); 538 );
539 - MARKETING_VERSION = 5.6.4; 539 + MARKETING_VERSION = 5.6.5;
540 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 540 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
541 PRODUCT_NAME = "$(TARGET_NAME)"; 541 PRODUCT_NAME = "$(TARGET_NAME)";
542 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 542 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -710,7 +710,7 @@ @@ -710,7 +710,7 @@
710 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 710 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
711 CLANG_ENABLE_MODULES = YES; 711 CLANG_ENABLE_MODULES = YES;
712 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 712 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
713 - CURRENT_PROJECT_VERSION = 564; 713 + CURRENT_PROJECT_VERSION = 5654;
714 DEVELOPMENT_TEAM = 8J59HM8B82; 714 DEVELOPMENT_TEAM = 8J59HM8B82;
715 ENABLE_BITCODE = NO; 715 ENABLE_BITCODE = NO;
716 INFOPLIST_FILE = Runner/Info.plist; 716 INFOPLIST_FILE = Runner/Info.plist;
@@ -719,7 +719,7 @@ @@ -719,7 +719,7 @@
719 "$(inherited)", 719 "$(inherited)",
720 "@executable_path/Frameworks", 720 "@executable_path/Frameworks",
721 ); 721 );
722 - MARKETING_VERSION = 5.6.4; 722 + MARKETING_VERSION = 5.6.5;
723 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 723 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
724 PRODUCT_NAME = "$(TARGET_NAME)"; 724 PRODUCT_NAME = "$(TARGET_NAME)";
725 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 725 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -736,7 +736,7 @@ @@ -736,7 +736,7 @@
736 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 736 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
737 CLANG_ENABLE_MODULES = YES; 737 CLANG_ENABLE_MODULES = YES;
738 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 738 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
739 - CURRENT_PROJECT_VERSION = 564; 739 + CURRENT_PROJECT_VERSION = 5654;
740 DEVELOPMENT_TEAM = 8J59HM8B82; 740 DEVELOPMENT_TEAM = 8J59HM8B82;
741 ENABLE_BITCODE = NO; 741 ENABLE_BITCODE = NO;
742 INFOPLIST_FILE = Runner/Info.plist; 742 INFOPLIST_FILE = Runner/Info.plist;
@@ -745,7 +745,7 @@ @@ -745,7 +745,7 @@
745 "$(inherited)", 745 "$(inherited)",
746 "@executable_path/Frameworks", 746 "@executable_path/Frameworks",
747 ); 747 );
748 - MARKETING_VERSION = 5.6.4; 748 + MARKETING_VERSION = 5.6.5;
749 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 749 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
750 PRODUCT_NAME = "$(TARGET_NAME)"; 750 PRODUCT_NAME = "$(TARGET_NAME)";
751 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 751 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -207,7 +207,7 @@ class InvicationPageState extends State<InvicationPage> @@ -207,7 +207,7 @@ class InvicationPageState extends State<InvicationPage>
207 207
208 WidgetsBinding.instance.addObserver(this); 208 WidgetsBinding.instance.addObserver(this);
209 enterMore = App.sp!.getBool("enterMore") ?? true; 209 enterMore = App.sp!.getBool("enterMore") ?? true;
210 - https: //xt04.colorcun.com/docs.php?service=App.Reserve.SaveNoticeLog&detail=1&type=fold 210 + //https:xt04.colorcun.com/docs.php?service=App.Reserve.SaveNoticeLog&detail=1&type=fold
211 211
212 personNumList = Utils.getPersonNumList(); 212 personNumList = Utils.getPersonNumList();
213 sexList = ['先生', '女士', '公司', '贵宾']; 213 sexList = ['先生', '女士', '公司', '贵宾'];
@@ -887,7 +887,7 @@ class InvicationPageState extends State<InvicationPage> @@ -887,7 +887,7 @@ class InvicationPageState extends State<InvicationPage>
887 _showConfirmWidget( 887 _showConfirmWidget(
888 {needBack = false, 888 {needBack = false,
889 needSex = false, 889 needSex = false,
890 - needHistory = false, 890 + needHistorytemp = false,
891 needWechat = false, 891 needWechat = false,
892 needRemark = false, 892 needRemark = false,
893 int? index, 893 int? index,
@@ -909,7 +909,7 @@ class InvicationPageState extends State<InvicationPage> @@ -909,7 +909,7 @@ class InvicationPageState extends State<InvicationPage>
909 if (oldName != name || 909 if (oldName != name ||
910 oldPhone != phone || 910 oldPhone != phone ||
911 needSex || 911 needSex ||
912 - needHistory || 912 + needHistorytemp ||
913 needRemark || 913 needRemark ||
914 oldRemark != remark || 914 oldRemark != remark ||
915 oldPum != detailModel.selectNum) { 915 oldPum != detailModel.selectNum) {
@@ -931,7 +931,7 @@ class InvicationPageState extends State<InvicationPage> @@ -931,7 +931,7 @@ class InvicationPageState extends State<InvicationPage>
931 // if (needRemark) { 931 // if (needRemark) {
932 // needRemark = false; 932 // needRemark = false;
933 // } 933 // }
934 - if (needHistory) { 934 + if (needHistorytemp) {
935 setState(() { 935 setState(() {
936 showPhoneHistory = false; 936 showPhoneHistory = false;
937 _baseIndoProvider.phoneController.text = 937 _baseIndoProvider.phoneController.text =
@@ -3500,7 +3500,7 @@ class InvicationPageState extends State<InvicationPage> @@ -3500,7 +3500,7 @@ class InvicationPageState extends State<InvicationPage>
3500 userHistoryEntity.phone); 3500 userHistoryEntity.phone);
3501 needHistory = true; 3501 needHistory = true;
3502 _showConfirmWidget( 3502 _showConfirmWidget(
3503 - needHistory: true, index: index); 3503 + needHistorytemp: true, index: index);
3504 }, 3504 },
3505 child: Container( 3505 child: Container(
3506 width: double.infinity, 3506 width: double.infinity,
@@ -4805,6 +4805,18 @@ class InvicationPageState extends State<InvicationPage> @@ -4805,6 +4805,18 @@ class InvicationPageState extends State<InvicationPage>
4805 left: 0.0, 4805 left: 0.0,
4806 child: InputDoneView( 4806 child: InputDoneView(
4807 callback: () { 4807 callback: () {
  4808 + if(_nameNode.hasFocus){
  4809 + _nameNode.unfocus();
  4810 + }
  4811 + else if(_phoneNode.hasFocus){
  4812 + _phoneNode.unfocus();
  4813 +
  4814 + }
  4815 + else if(_pnumNode.hasFocus){
  4816 + _pnumNode.unfocus();
  4817 + }else if(_cusdemNode.hasFocus){
  4818 + _cusdemNode.unfocus();
  4819 + }
4808 // _updateMoney(); 4820 // _updateMoney();
4809 }, 4821 },
4810 )); 4822 ));
@@ -4911,7 +4923,7 @@ class InvicationPageState extends State<InvicationPage> @@ -4911,7 +4923,7 @@ class InvicationPageState extends State<InvicationPage>
4911 4923
4912 _getIsMemberByPhone(userHistoryEntity.phone); 4924 _getIsMemberByPhone(userHistoryEntity.phone);
4913 needHistory = true; 4925 needHistory = true;
4914 - _showConfirmWidget(needHistory: true, index: value[0]); 4926 + _showConfirmWidget(needHistorytemp: true, index: value[0]);
4915 } 4927 }
4916 }, title: '从通话记录选择客人电话', selecteds: [ 4928 }, title: '从通话记录选择客人电话', selecteds: [
4917 // _getFirSelected(hourAndMinute, data), 4929 // _getFirSelected(hourAndMinute, data),