From 9e7a46cde7c6b25970c760879f6f0ff9c5271818 Mon Sep 17 00:00:00 2001 From: spadek <1437921734@qq.com> Date: Tue, 8 Oct 2019 20:51:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E4=B8=BAIOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/proguard-rules.pro | 3 ++- ios/Flutter/flutter_export_environment.sh | 10 ++++++++++ lib/src/data/settingData.dart | 2 +- lib/src/view/app.dart | 2 +- pubspec.lock | 14 +++++++------- pubspec.yaml | 2 +- test/widget_test.dart | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 ios/Flutter/flutter_export_environment.sh diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index babebba..4776fd5 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -4,4 +4,5 @@ -keep class io.flutter.util.** { *; } -keep class io.flutter.view.** { *; } -keep class io.flutter.** { *; } --keep class io.flutter.plugins.** { *; } \ No newline at end of file +-keep class io.flutter.plugins.** { *; } +-dontwarn io.flutter.embedding.** \ No newline at end of file diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh new file mode 100644 index 0000000..a68e855 --- /dev/null +++ b/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=D:\development\flutter_windows_v1.9.1hotfix.4-stable\flutter" +export "FLUTTER_APPLICATION_PATH=D:\code\flutter\Flutter_Calculate" +export "FLUTTER_TARGET=lib\main.dart" +export "FLUTTER_BUILD_DIR=build" +export "SYMROOT=${SOURCE_ROOT}/../build\ios" +export "FLUTTER_FRAMEWORK_DIR=D:\development\flutter_windows_v1.9.1hotfix.4-stable\flutter\bin\cache\artifacts\engine\ios" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1" diff --git a/lib/src/data/settingData.dart b/lib/src/data/settingData.dart index 8a77eba..46c4775 100644 --- a/lib/src/data/settingData.dart +++ b/lib/src/data/settingData.dart @@ -17,7 +17,7 @@ class SettingData with ChangeNotifier{ SettingData() { _fixedNum = 6; - theme = "Android"; + theme = "IOS"; nowPage = 0; language = "en"; } diff --git a/lib/src/view/app.dart b/lib/src/view/app.dart index 62dd659..fe50609 100644 --- a/lib/src/view/app.dart +++ b/lib/src/view/app.dart @@ -12,7 +12,7 @@ class MyApp extends StatelessWidget { Widget build(BuildContext context) { return CupertinoApp( color: Colors.white, - debugShowCheckedModeBanner: false, +// debugShowCheckedModeBanner: false, localizationsDelegates: [ GlobalMaterialLocalizations.delegate, GlobalWidgetsLocalizations.delegate, diff --git a/pubspec.lock b/pubspec.lock index 68b245f..30fe3bd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,14 +21,14 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.0" + version: "2.3.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.4" + version: "1.0.5" charcode: dependency: transitive description: @@ -136,14 +136,14 @@ packages: name: meta url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.6" + version: "1.1.7" path: dependency: transitive description: name: path url: "https://pub.flutter-io.cn" source: hosted - version: "1.6.2" + version: "1.6.4" path_provider: dependency: "direct main" description: @@ -157,7 +157,7 @@ packages: name: pedantic url: "https://pub.flutter-io.cn" source: hosted - version: "1.7.0" + version: "1.8.0+1" petitparser: dependency: transitive description: @@ -178,7 +178,7 @@ packages: name: quiver url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.3" + version: "2.0.5" sky_engine: dependency: transitive description: flutter @@ -218,7 +218,7 @@ packages: name: string_scanner url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.4" + version: "1.0.5" synchronized: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 68f88c1..3a92463 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 provide: ^1.0.2 - keyboard_visibility: ^0.5.2 + keyboard_visibility: any dev_dependencies: flutter_test: diff --git a/test/widget_test.dart b/test/widget_test.dart index b0129d1..8ec7459 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:xiaoming/src/view/route/app.dart'; +import 'package:xiaoming/src/view/app.dart'; void main() {