From eeb0c41870288eab6fcb237047b9fced96efec96 Mon Sep 17 00:00:00 2001 From: "xj.deng" Date: Mon, 29 Apr 2019 17:09:38 +0800 Subject: [PATCH] test app store --- android/app/build.gradle | 2 +- ios/Runner.xcodeproj/project.pbxproj | 23 ++++++++++++------- .../elements/Frame/Box/DecoratedBox/demo.dart | 10 -------- pubspec.lock | 18 +++++++-------- pubspec.yaml | 4 ++-- 5 files changed, 27 insertions(+), 30 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index db879d4a..20036ba7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -45,7 +45,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.ali.fluttergo" + applicationId "com.ali.paimai.fluttergo" minSdkVersion 16 targetSdkVersion 27 versionCode flutterVersionCode.toInteger() diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 53919b45..0f2c1700 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -243,7 +243,8 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = RDJKXT446D; + DevelopmentTeam = 4WLT68XRNA; + ProvisioningStyle = Manual; }; }; }; @@ -252,6 +253,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -350,8 +352,8 @@ files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework", + "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -359,7 +361,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -509,8 +511,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = Launch2; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = RDJKXT446D; + DEVELOPMENT_TEAM = 4WLT68XRNA; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -522,8 +525,9 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.ali.fluttergo; + PRODUCT_BUNDLE_IDENTIFIER = com.ali.paimai.fluttergo; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "FlutterGO-pm-develop"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -534,8 +538,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = Launch2; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = RDJKXT446D; + DEVELOPMENT_TEAM = 4WLT68XRNA; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -547,8 +553,9 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.ali.fluttergo; + PRODUCT_BUNDLE_IDENTIFIER = com.ali.paimai.fluttergo; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "FlutterGO-distribution_pm_ad_hoc"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart b/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart index 35874df3..86da89f3 100644 --- a/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart +++ b/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart @@ -20,14 +20,8 @@ class DecoratedBoxCreate extends StatelessWidget { color: const Color(0xff7c94b6), //设置图片内容 image: DecorationImage( - -<<<<<<< HEAD ///fix:BoxFit.contain: 保持图片的比例，最大程度填充容器 BoxFit.fill:容器被图片完全填充，不在意图片比例，只填充整个容器 ///fix:BoxFit.fitWidth：图片以宽被完全填充 BoxFit.fix:fixHigth:图片以高度完全填充 -======= - ///fix:BoxFit.contain: 保持图片的比例，最大程度填充容器 BoxFit.fill:容器被图片完全填充，不在意图片比例，只填充整个容器 - ///fix:BoxFit.fitWidth：图片以宽被完全填充 BoxFit.fix:fixHigth:图片以高度完全填充 ->>>>>>> develop fit: BoxFit.cover, //图片填充整个容器，按比例放大，多余部分被裁切 image: ExactAssetImage('assets/images/food01.jpeg')), //外宽边框，可以不设置 @@ -97,11 +91,7 @@ class DecoratedBoxCreateShapes extends StatelessWidget { position: DecorationPosition.background, decoration: BoxDecoration( gradient: const LinearGradient( -<<<<<<< HEAD - //渐变效果 线性渐变 -======= //渐变效果 线性渐变 ->>>>>>> develop colors: [Colors.red, Colors.yellowAccent, Colors.lightGreenAccent]), // color: const Color(0xff7c94b6), border: Border.all( diff --git a/pubspec.lock b/pubspec.lock index 974d67ed..da5323ac 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" boolean_selector: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: city_pickers url: "https://pub.dartlang.org" source: hosted - version: "0.1.16" + version: "0.0.4" collection: dependency: transitive description: @@ -122,7 +122,7 @@ packages: name: image_picker url: "https://pub.dartlang.org" source: hosted - version: "0.4.12+1" + version: "0.6.0+1" intl: dependency: "direct main" description: @@ -178,14 +178,14 @@ packages: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shared_preferences: dependency: "direct main" description: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.5.2" sky_engine: dependency: transitive description: flutter @@ -204,7 +204,7 @@ packages: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "0.12.2+1" + version: "1.1.5" stack_trace: dependency: transitive description: @@ -246,7 +246,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.4" + version: "0.2.5" typed_data: dependency: transitive description: @@ -260,7 +260,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "4.2.0+3" + version: "5.0.2" vector_math: dependency: transitive description: @@ -270,4 +270,4 @@ packages: version: "2.0.8" sdks: dart: ">=2.2.0 <3.0.0" - flutter: ">=0.5.6 <2.0.0" + flutter: ">=1.2.1 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 65e4c793..867114bb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,13 +28,13 @@ dependencies: # 本地存储、收藏功能 shared_preferences: ^0.5.2 dio: ^1.0.6 - flutter_webview_plugin: ^0.3.0+2 + flutter_webview_plugin: ^0.3.4 # 日期格式化 intl: 0.15.7 city_pickers: ^0.0.1 firebase_analytics: ^2.0.2+1 #firebase_auth: ^0.8.3 #auth -# firebase_core: ^0.3.4 # add dependency for Firebase Core + firebase_core: ^0.3.4 # add dependency for Firebase Core dev_dependencies: flutter_test: