xt / Flutter-ReserveApp · Commits

Go to a project

Commit fbb6a3143153b6103b01340f6c4dc44fa24756e3

Authored by “gaiyaguang”
2 parents f8fe8182 46932d38

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

Inline Side-by-side
Showing 5 changed files with 16 additions and 15 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 115  
47 - versionName "1.1.5" 46 + versionCode 116
  47 + versionName "1.1.6"
48 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 48 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
49 49
50 ndk { 50 ndk {
1 -860cea0521558e1c8a34a8bd64231ea0  
  1 +c8424a7225c7d158c8fb32a172a5bf4c
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 CreatedOnToolsVersion = 7.3.1; 174 CreatedOnToolsVersion = 7.3.1;
175 DevelopmentTeam = 8J59HM8B82; 175 DevelopmentTeam = 8J59HM8B82;
176 LastSwiftMigration = 1100; 176 LastSwiftMigration = 1100;
177 - ProvisioningStyle = Manual; 177 + ProvisioningStyle = Automatic;
178 }; 178 };
179 }; 179 };
180 }; 180 };
@@ -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 = 115; 407 + CURRENT_PROJECT_VERSION = 116;
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.5; 420 + MARKETING_VERSION = 1.1.6;
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 = "";
@@ -544,8 +544,9 @@ @@ -544,8 +544,9 @@
544 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 544 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
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;  
548 - CURRENT_PROJECT_VERSION = 115; 547 + CODE_SIGN_IDENTITY = "Apple Development";
  548 + CODE_SIGN_STYLE = Automatic;
  549 + CURRENT_PROJECT_VERSION = 116;
549 DEVELOPMENT_TEAM = 8J59HM8B82; 550 DEVELOPMENT_TEAM = 8J59HM8B82;
550 ENABLE_BITCODE = NO; 551 ENABLE_BITCODE = NO;
551 FRAMEWORK_SEARCH_PATHS = ( 552 FRAMEWORK_SEARCH_PATHS = (
@@ -558,10 +559,10 @@ @@ -558,10 +559,10 @@
558 "$(inherited)", 559 "$(inherited)",
559 "$(PROJECT_DIR)/Flutter", 560 "$(PROJECT_DIR)/Flutter",
560 ); 561 );
561 - MARKETING_VERSION = 1.1.5; 562 + MARKETING_VERSION = 1.1.6;
562 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 563 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
563 PRODUCT_NAME = "一键订"; 564 PRODUCT_NAME = "一键订";
564 - PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile"; 565 + PROVISIONING_PROFILE_SPECIFIER = "";
565 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 566 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
566 SWIFT_OPTIMIZATION_LEVEL = "-Onone"; 567 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
567 SWIFT_VERSION = 5.0; 568 SWIFT_VERSION = 5.0;
@@ -578,8 +579,8 @@ @@ -578,8 +579,8 @@
578 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 579 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
579 CODE_SIGN_IDENTITY = "Apple Development"; 580 CODE_SIGN_IDENTITY = "Apple Development";
580 CODE_SIGN_STYLE = Automatic; 581 CODE_SIGN_STYLE = Automatic;
581 - CURRENT_PROJECT_VERSION = 115;  
582 - DEVELOPMENT_TEAM = ""; 582 + CURRENT_PROJECT_VERSION = 116;
  583 + DEVELOPMENT_TEAM = 8J59HM8B82;
583 ENABLE_BITCODE = NO; 584 ENABLE_BITCODE = NO;
584 FRAMEWORK_SEARCH_PATHS = ( 585 FRAMEWORK_SEARCH_PATHS = (
585 "$(inherited)", 586 "$(inherited)",
@@ -591,7 +592,7 @@ @@ -591,7 +592,7 @@
591 "$(inherited)", 592 "$(inherited)",
592 "$(PROJECT_DIR)/Flutter", 593 "$(PROJECT_DIR)/Flutter",
593 ); 594 );
594 - MARKETING_VERSION = 1.1.5; 595 + MARKETING_VERSION = 1.1.6;
595 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 596 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
596 PRODUCT_NAME = "一键订"; 597 PRODUCT_NAME = "一键订";
597 PROVISIONING_PROFILE_SPECIFIER = ""; 598 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -29,7 +29,7 @@ Future<void> main() async { @@ -29,7 +29,7 @@ Future<void> main() async {
29 Routes.configureRoutes(router); 29 Routes.configureRoutes(router);
30 App.router = router; 30 App.router = router;
31 App.setupLocator(); 31 App.setupLocator();
32 - LogUtil.init(isDebug: true, tag: 'ONE_KEY'); 32 + LogUtil.init(isDebug: false, tag: 'ONE_KEY');
33 Provider.debugCheckInvalidValueType = null; 33 Provider.debugCheckInvalidValueType = null;
34 await initializeDateFormatting(); 34 await initializeDateFormatting();
35 SystemChrome.setPreferredOrientations( 35 SystemChrome.setPreferredOrientations(
@@ -87,7 +87,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{ @@ -87,7 +87,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver{
87 initPlatformState(){ 87 initPlatformState(){
88 88
89 /// 开启DEBUG 89 /// 开启DEBUG
90 - XgFlutterPlugin().setEnableDebug(true); 90 + XgFlutterPlugin().setEnableDebug(false);
91 91
92 /// 添加回调事件 92 /// 添加回调事件
93 XgFlutterPlugin().addEventHandler( 93 XgFlutterPlugin().addEventHandler(