xt / Flutter-ReserveApp · Commits

Go to a project

Commit 207df1894b429fe451a3042e052f37886a924732

Authored by “gaiyaguang”
2 parents ed0dfc25 ece82516
build: skipped

Merge branch 'v1.1+' of http://123.56.79.57/xt/Flutter-ReserveApp into v1.1+

Inline Side-by-side
Showing 6 changed files with 24 additions and 18 deletions
@@ -43,8 +43,8 @@ android { @@ -43,8 +43,8 @@ android {
43 applicationId "com.naji.one_key" 43 applicationId "com.naji.one_key"
44 minSdkVersion 21 44 minSdkVersion 21
45 targetSdkVersion 28 45 targetSdkVersion 28
46 - versionCode 114  
47 - versionName "1.1.4" 46 + versionCode 115
  47 + versionName "1.1.5"
48 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 48 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
49 49
50 ndk { 50 ndk {
1 -7babc7873f8d177769b987ba4c6c2911  
  1 +860cea0521558e1c8a34a8bd64231ea0
@@ -140,4 +140,4 @@ SPEC CHECKSUMS: @@ -140,4 +140,4 @@ SPEC CHECKSUMS:
140 140
141 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c 141 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
142 142
143 -COCOAPODS: 1.9.3 143 +COCOAPODS: 1.9.1
@@ -371,7 +371,7 @@ @@ -371,7 +371,7 @@
371 CLANG_WARN_SUSPICIOUS_MOVE = YES; 371 CLANG_WARN_SUSPICIOUS_MOVE = YES;
372 CLANG_WARN_UNREACHABLE_CODE = YES; 372 CLANG_WARN_UNREACHABLE_CODE = YES;
373 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 373 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
374 - CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; 374 + CODE_SIGN_IDENTITY = "iPhone Developer: 亚光 盖 (78U98359LM)";
375 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; 375 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
376 COPY_PHASE_STRIP = NO; 376 COPY_PHASE_STRIP = NO;
377 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 377 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -404,7 +404,7 @@ @@ -404,7 +404,7 @@
404 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 404 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
405 CODE_SIGN_IDENTITY = "Apple Development"; 405 CODE_SIGN_IDENTITY = "Apple Development";
406 CODE_SIGN_STYLE = Automatic; 406 CODE_SIGN_STYLE = Automatic;
407 - CURRENT_PROJECT_VERSION = 112; 407 + CURRENT_PROJECT_VERSION = 115;
408 DEVELOPMENT_TEAM = 8J59HM8B82; 408 DEVELOPMENT_TEAM = 8J59HM8B82;
409 ENABLE_BITCODE = NO; 409 ENABLE_BITCODE = NO;
410 FRAMEWORK_SEARCH_PATHS = ( 410 FRAMEWORK_SEARCH_PATHS = (
@@ -417,7 +417,7 @@ @@ -417,7 +417,7 @@
417 "$(inherited)", 417 "$(inherited)",
418 "$(PROJECT_DIR)/Flutter", 418 "$(PROJECT_DIR)/Flutter",
419 ); 419 );
420 - MARKETING_VERSION = 1.1.2; 420 + MARKETING_VERSION = 1.1.5;
421 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 421 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
422 PRODUCT_NAME = "一键订"; 422 PRODUCT_NAME = "一键订";
423 PROVISIONING_PROFILE_SPECIFIER = ""; 423 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -512,7 +512,7 @@ @@ -512,7 +512,7 @@
512 CLANG_WARN_SUSPICIOUS_MOVE = YES; 512 CLANG_WARN_SUSPICIOUS_MOVE = YES;
513 CLANG_WARN_UNREACHABLE_CODE = YES; 513 CLANG_WARN_UNREACHABLE_CODE = YES;
514 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 514 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
515 - CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; 515 + CODE_SIGN_IDENTITY = "iPhone Developer: 亚光 盖 (78U98359LM)";
516 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; 516 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
517 COPY_PHASE_STRIP = NO; 517 COPY_PHASE_STRIP = NO;
518 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 518 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -545,7 +545,7 @@ @@ -545,7 +545,7 @@
545 CLANG_ENABLE_MODULES = YES; 545 CLANG_ENABLE_MODULES = YES;
546 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 546 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
547 CODE_SIGN_STYLE = Manual; 547 CODE_SIGN_STYLE = Manual;
548 - CURRENT_PROJECT_VERSION = 112; 548 + CURRENT_PROJECT_VERSION = 115;
549 DEVELOPMENT_TEAM = 8J59HM8B82; 549 DEVELOPMENT_TEAM = 8J59HM8B82;
550 ENABLE_BITCODE = NO; 550 ENABLE_BITCODE = NO;
551 FRAMEWORK_SEARCH_PATHS = ( 551 FRAMEWORK_SEARCH_PATHS = (
@@ -558,7 +558,7 @@ @@ -558,7 +558,7 @@
558 "$(inherited)", 558 "$(inherited)",
559 "$(PROJECT_DIR)/Flutter", 559 "$(PROJECT_DIR)/Flutter",
560 ); 560 );
561 - MARKETING_VERSION = 1.1.2; 561 + MARKETING_VERSION = 1.1.5;
562 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 562 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
563 PRODUCT_NAME = "一键订"; 563 PRODUCT_NAME = "一键订";
564 PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile"; 564 PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
@@ -576,9 +576,10 @@ @@ -576,9 +576,10 @@
576 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 576 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
577 CLANG_ENABLE_MODULES = YES; 577 CLANG_ENABLE_MODULES = YES;
578 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 578 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
579 - CODE_SIGN_STYLE = Manual;  
580 - CURRENT_PROJECT_VERSION = 112;  
581 - DEVELOPMENT_TEAM = 8J59HM8B82; 579 + CODE_SIGN_IDENTITY = "Apple Development";
  580 + CODE_SIGN_STYLE = Automatic;
  581 + CURRENT_PROJECT_VERSION = 115;
  582 + DEVELOPMENT_TEAM = "";
582 ENABLE_BITCODE = NO; 583 ENABLE_BITCODE = NO;
583 FRAMEWORK_SEARCH_PATHS = ( 584 FRAMEWORK_SEARCH_PATHS = (
584 "$(inherited)", 585 "$(inherited)",
@@ -590,10 +591,10 @@ @@ -590,10 +591,10 @@
590 "$(inherited)", 591 "$(inherited)",
591 "$(PROJECT_DIR)/Flutter", 592 "$(PROJECT_DIR)/Flutter",
592 ); 593 );
593 - MARKETING_VERSION = 1.1.2; 594 + MARKETING_VERSION = 1.1.5;
594 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 595 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
595 PRODUCT_NAME = "一键订"; 596 PRODUCT_NAME = "一键订";
596 - PROVISIONING_PROFILE_SPECIFIER = "OneKey Distribution Profile"; 597 + PROVISIONING_PROFILE_SPECIFIER = "";
597 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 598 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
598 SWIFT_VERSION = 5.0; 599 SWIFT_VERSION = 5.0;
599 VERSIONING_SYSTEM = "apple-generic"; 600 VERSIONING_SYSTEM = "apple-generic";
@@ -68,7 +68,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{ @@ -68,7 +68,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{
68 )); 68 ));
69 WidgetsBinding.instance.addPostFrameCallback((_){ 69 WidgetsBinding.instance.addPostFrameCallback((_){
70 if(widget.initialIndex==0)return; 70 if(widget.initialIndex==0)return;
71 - initPlatformState(); 71 + Future.delayed(Duration(milliseconds: 300),(){
  72 + initPlatformState();
  73 + });
72 Future.delayed(Duration(milliseconds: 30000),(){ 74 Future.delayed(Duration(milliseconds: 30000),(){
73 ContactModel.getInstance().uploadLocalContact(context); 75 ContactModel.getInstance().uploadLocalContact(context);
74 }); 76 });
@@ -108,6 +110,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{ @@ -108,6 +110,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{
108 LogUtil.v("注册成功：$token"); 110 LogUtil.v("注册成功：$token");
109 // Utils.showToast("注册成功：$token"); 111 // Utils.showToast("注册成功：$token");
110 userTokenInit(token); 112 userTokenInit(token);
  113 + XgFlutterPlugin().setAppBadge(0);
111 } 114 }
112 }, 115 },
113 unRegistered: (String msg) async { 116 unRegistered: (String msg) async {
@@ -122,7 +125,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{ @@ -122,7 +125,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{
122 xgPushDidSetBadge: (String msg) async { 125 xgPushDidSetBadge: (String msg) async {
123 print("flutter xgPushDidSetBadge: $msg"); 126 print("flutter xgPushDidSetBadge: $msg");
124 /// 在此可设置应用角标 127 /// 在此可设置应用角标
125 - /// XgFlutterPlugin().setAppBadge(0);; 128 + XgFlutterPlugin().setAppBadge(0);
126 }, 129 },
127 xgPushDidBindWithIdentifier: (String msg) async { 130 xgPushDidBindWithIdentifier: (String msg) async {
128 print("flutter xgPushDidBindWithIdentifier: $msg"); 131 print("flutter xgPushDidBindWithIdentifier: $msg");
@@ -41,7 +41,9 @@ class SmsPageState extends State<SmsPage>{ @@ -41,7 +41,9 @@ class SmsPageState extends State<SmsPage>{
41 userModel=Provider.of<UserModel>(context,listen: false); 41 userModel=Provider.of<UserModel>(context,listen: false);
42 WidgetsBinding.instance.addPostFrameCallback((_){ 42 WidgetsBinding.instance.addPostFrameCallback((_){
43 _getSmsContent(); 43 _getSmsContent();
44 - ContactModel.getInstance().uploadLocalContact(context); 44 + Future.delayed(Duration(milliseconds: 300),(){
  45 + ContactModel.getInstance().uploadLocalContact(context);
  46 + });
45 }); 47 });
46 } 48 }
47 49