From e3ec1e72eca3a5dc49d974605c3b12b732cad442 Mon Sep 17 00:00:00 2001 From: "xj.deng" Date: Mon, 29 Apr 2019 15:07:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/google-services.json | 4 +-- android/app/src/debug/AndroidManifest.xml | 2 +- android/app/src/main/AndroidManifest.xml | 2 +- .../ali/com/fluttergo/MainActivity.kt | 2 +- android/app/src/profile/AndroidManifest.xml | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 6 ++-- ios/Runner/GoogleService-Info.plist | 2 +- .../LaunchImage-2.launchimage/Contents.json | 33 ++++++------------- lib/main.dart | 1 + pubspec.yaml | 12 +++---- 10 files changed, 27 insertions(+), 39 deletions(-) diff --git a/android/app/google-services.json b/android/app/google-services.json index 5da02053..7260409a 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -10,7 +10,7 @@ "client_info": { "mobilesdk_app_id": "1:1002138254102:android:00e8533fa0274183", "android_client_info": { - "package_name": "com.ali.fluttergo" + "package_name": "com.ali.paimai.fluttergo" } }, "oauth_client": [ @@ -35,7 +35,7 @@ "client_id": "1002138254102-qo9jp8c3lc69p9lclu0rtp5dmt1kulv7.apps.googleusercontent.com", "client_type": 2, "ios_info": { - "bundle_id": "com.ali.fluttergo" + "bundle_id": "com.ali.paimai.fluttergo" } } ] diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 6c60789b..48861a46 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.ali.paimai.fluttergo"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 97b1e4ee..f476bc87 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.ali.paimai.fluttergo"> diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index ba1a9822..3c6e5445 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ + buildConfiguration = "Release"> PLIST_VERSION 1 BUNDLE_ID - com.ali.fluttergo + com.ali.paimai.fluttergo PROJECT_ID ali-flutter-go STORAGE_BUCKET diff --git a/ios/Runner/Images.xcassets/LaunchImage-2.launchimage/Contents.json b/ios/Runner/Images.xcassets/LaunchImage-2.launchimage/Contents.json index 5a296668..a0ad363c 100644 --- a/ios/Runner/Images.xcassets/LaunchImage-2.launchimage/Contents.json +++ b/ios/Runner/Images.xcassets/LaunchImage-2.launchimage/Contents.json @@ -3,43 +3,30 @@ { "orientation" : "portrait", "idiom" : "ipad", - "minimum-system-version" : "7.0", "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", "minimum-system-version" : "7.0", - "extent" : "full-screen", "scale" : "1x" }, { "orientation" : "landscape", "idiom" : "ipad", - "minimum-system-version" : "7.0", "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "minimum-system-version" : "7.0", - "subtype" : "retina4", - "scale" : "2x" + "scale" : "1x" }, { "orientation" : "portrait", "idiom" : "ipad", - "minimum-system-version" : "7.0", "extent" : "full-screen", - "scale" : "1x" + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" } ], "info" : { diff --git a/lib/main.dart b/lib/main.dart index f83e2133..8f403125 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -53,6 +53,7 @@ class MyApp extends StatelessWidget { home: new Scaffold( body: showWelcomePage() ), + debugShowCheckedModeBanner: false, onGenerateRoute: Application.router.generator, navigatorObservers: [Analytics.observer], ); diff --git a/pubspec.yaml b/pubspec.yaml index b97443ed..65e4c793 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,20 +21,20 @@ dependencies: cupertino_icons: ^0.1.2 event_bus: ^1.0.1 fluro: ^1.3.4 - image_picker: ^0.4.10 - sqflite: ^0.12.1 + image_picker: ^0.6.0+1 + sqflite: ^1.1.5 flutter_markdown: ^0.2.0 - url_launcher: ^4.0.1 + url_launcher: ^5.0.2 # 本地存储、收藏功能 - shared_preferences: ^0.4.3 + shared_preferences: ^0.5.2 dio: ^1.0.6 flutter_webview_plugin: ^0.3.0+2 # 日期格式化 intl: 0.15.7 - city_pickers: ^0.1.0 + city_pickers: ^0.0.1 firebase_analytics: ^2.0.2+1 #firebase_auth: ^0.8.3 #auth - firebase_core: ^0.3.0 # add dependency for Firebase Core +# firebase_core: ^0.3.4 # add dependency for Firebase Core dev_dependencies: flutter_test: