From b39c2849f65c42d4968440bb38a4a511e533f62d Mon Sep 17 00:00:00 2001
From: luhenchang <1276998208@qq.com>
Date: Wed, 13 Mar 2019 19:23:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A7=94=E5=A9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/libraries/Dart_Packages.xml             |  64 ++++++-----
 .idea/libraries/Flutter_Plugins.xml           |   8 +-
 android/.idea/gradle.xml                      |  16 +--
 .../markdown-navigator/profiles_settings.xml  |   3 -
 android/.idea/misc.xml                        | 102 +-----------------
 android/.idea/modules.xml                     |  16 +--
 android/.idea/vcs.xml                         |   6 ++
 android/app/build.gradle                      |   1 -
 android/app/src/main/AndroidManifest.xml      |   5 +-
 .../java/io/flutter/plugins/ToastyPlugin.java |  57 ----------
 .../com/example/flutterstudy/MainActivity.kt  |   8 +-
 android/gradlew                               |   0
 flutter_study.iml                             |  58 +++++++++-
 ios/Runner.xcodeproj/project.pbxproj          |  90 +++++++++++++++-
 .../contents.xcworkspacedata                  |   3 +
 lib/main.dart                                 |   9 +-
 pubspec.lock                                  |  44 +++++---
 pubspec.yaml                                  |   3 +-
 18 files changed, 257 insertions(+), 236 deletions(-)
 delete mode 100644 android/.idea/markdown-navigator/profiles_settings.xml
 create mode 100644 android/.idea/vcs.xml
 delete mode 100644 android/app/src/main/java/io/flutter/plugins/ToastyPlugin.java
 mode change 100644 => 100755 android/gradlew

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 0b0f916..4aeda98 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -61,7 +61,7 @@
         <entry key="convert">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.0.2/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1/lib" />
             </list>
           </value>
         </entry>
@@ -103,7 +103,14 @@
         <entry key="flutter_cache_manager">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-0.3.0/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-0.3.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="flutter_page_indicator">
+          <value>
+            <list>
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_page_indicator-0.0.3/lib" />
             </list>
           </value>
         </entry>
@@ -117,14 +124,14 @@
         <entry key="flutter_staggered_grid_view">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_staggered_grid_view-0.2.2/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_staggered_grid_view-0.2.7/lib" />
             </list>
           </value>
         </entry>
         <entry key="flutter_swiper">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_swiper-1.0.2/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_swiper-1.1.5/lib" />
             </list>
           </value>
         </entry>
@@ -138,7 +145,7 @@
         <entry key="fluttertoast">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.0.0/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.0.3/lib" />
             </list>
           </value>
         </entry>
@@ -159,7 +166,7 @@
         <entry key="image_picker">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.5/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.12+1/lib" />
             </list>
           </value>
         </entry>
@@ -208,14 +215,14 @@
         <entry key="pedantic">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.4.0/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.5.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="pull_to_refresh">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pull_to_refresh-1.1.5/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pull_to_refresh-1.1.6/lib" />
             </list>
           </value>
         </entry>
@@ -229,7 +236,7 @@
         <entry key="shared_preferences">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.2/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.3/lib" />
             </list>
           </value>
         </entry>
@@ -250,14 +257,14 @@
         <entry key="source_span">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.4/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="sqflite">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.0/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.3/lib" />
             </list>
           </value>
         </entry>
@@ -285,7 +292,7 @@
         <entry key="synchronized">
           <value>
             <list>
-              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.0.2+1/lib" />
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.1.0/lib" />
             </list>
           </value>
         </entry>
@@ -303,6 +310,13 @@
             </list>
           </value>
         </entry>
+        <entry key="transformer_page_view">
+          <value>
+            <list>
+              <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/transformer_page_view-0.1.5/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="transparent_image">
           <value>
             <list>
@@ -349,38 +363,40 @@
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/charts_flutter-0.4.0/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.11/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.3.1/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.0.2/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.0.6/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/cupertino_icons-0.1.2/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.2.1/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/english_words-3.1.5/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-0.3.0/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-0.3.2/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_page_indicator-0.0.3/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_slidable-0.4.9/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_staggered_grid_view-0.2.2/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_swiper-1.0.2/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.0.0/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_staggered_grid_view-0.2.7/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_swiper-1.1.5/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.0.3/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.0+1/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.3/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.5/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.12+1/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/intl-0.15.7/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/logging-0.11.3+2/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.3+1/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.6/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.2/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-0.5.0+1/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.4.0/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pull_to_refresh-1.1.5/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.5.0/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pull_to_refresh-1.1.6/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.0.1/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.2/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.3/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shimmer-0.0.6/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.4/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.0/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.5/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.3/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-1.6.8/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.4/lib" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.0.2+1/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.1.0/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.2/lib" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/transformer_page_view-0.1.5/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/transparent_image-0.1.0/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6/lib" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.0.0/lib" />
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
index c9faa8c..f3ad465 100644
--- a/.idea/libraries/Flutter_Plugins.xml
+++ b/.idea/libraries/Flutter_Plugins.xml
@@ -1,14 +1,14 @@
 <component name="libraryTable">
   <library name="Flutter Plugins" type="FlutterPluginsLibraryType">
     <CLASSES>
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.5" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.2.1" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.0.0" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-0.5.0+1" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.3.1" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.0" />
-      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.2" />
       <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player-0.6.1" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.12+1" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.3" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.3" />
+      <root url="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.0.3" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index 463f03d..35a49a8 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -7,16 +7,16 @@
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
-            <option value="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.3.1/android" />
-            <option value="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.2.1/android" />
-            <option value="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-2.0.7/android" />
-            <option value="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.5/android" />
-            <option value="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-0.4.1/android" />
-            <option value="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.2/android" />
-            <option value="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-0.11.0+1/android" />
-            <option value="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player-0.6.1/android" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.3.1/android" />
+            <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.2.1/android" />
+            <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.0.3/android" />
+            <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.12+1/android" />
+            <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-0.5.0+1/android" />
+            <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.3/android" />
+            <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.3/android" />
+            <option value="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player-0.6.1/android" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/android/.idea/markdown-navigator/profiles_settings.xml b/android/.idea/markdown-navigator/profiles_settings.xml
deleted file mode 100644
index 57927c5..0000000
--- a/android/.idea/markdown-navigator/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="MarkdownNavigator.ProfileManager">
-  <settings default="" pdf-export="" />
-</component>
\ No newline at end of file
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
index 70b4592..7bfef59 100644
--- a/android/.idea/misc.xml
+++ b/android/.idea/misc.xml
@@ -1,106 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="MarkdownProjectSettings" wasCopied="true">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false" emojiShortcuts="1" emojiImages="0">
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="false" />
-        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="false" />
-        <option name="HTML_DEEP_PARSER" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="ADMONITION_EXT" value="false" />
-        <option name="ATTRIBUTES_EXT" value="false" />
-        <option name="COMMONMARK_LISTS" value="true" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="ENUMERATED_REFERENCES_EXT" value="false" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_LISTS" value="false" />
-        <option name="GITHUB_WIKI_LINKS" value="true" />
-        <option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="NO_TEXT_ATTRIBUTES" value="false" />
-        <option name="PARSE_HTML_ANCHOR_ID" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true" embedImages="false" embedHttpImages="false" imageUriSerials="false">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-      <cssUriHistory />
-    </CssSettings>
-    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="5">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/android/.idea/modules.xml b/android/.idea/modules.xml
index 393effe..b7deb7b 100644
--- a/android/.idea/modules.xml
+++ b/android/.idea/modules.xml
@@ -4,14 +4,14 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.3.1/android/connectivity.iml" filepath="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.3.1/android/connectivity.iml" />
-      <module fileurl="file://D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.2.1/android/device_info.iml" filepath="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.2.1/android/device_info.iml" />
-      <module fileurl="file://D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-2.0.7/android/fluttertoast.iml" filepath="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-2.0.7/android/fluttertoast.iml" />
-      <module fileurl="file://D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.5/android/image_picker.iml" filepath="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.5/android/image_picker.iml" />
-      <module fileurl="file://D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-0.4.1/android/path_provider.iml" filepath="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-0.4.1/android/path_provider.iml" />
-      <module fileurl="file://D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.2/android/shared_preferences.iml" filepath="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.2/android/shared_preferences.iml" />
-      <module fileurl="file://D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-0.11.0+1/android/sqflite.iml" filepath="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-0.11.0+1/android/sqflite.iml" />
-      <module fileurl="file://D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player-0.6.1/android/video_player.iml" filepath="D:/soft/studySoft/Flutter/flutterSdk/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player-0.6.1/android/video_player.iml" />
+      <module fileurl="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.3.1/android/connectivity.iml" filepath="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.3.1/android/connectivity.iml" />
+      <module fileurl="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.2.1/android/device_info.iml" filepath="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.2.1/android/device_info.iml" />
+      <module fileurl="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.0.3/android/fluttertoast.iml" filepath="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.0.3/android/fluttertoast.iml" />
+      <module fileurl="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.12+1/android/image_picker.iml" filepath="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.4.12+1/android/image_picker.iml" />
+      <module fileurl="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-0.5.0+1/android/path_provider.iml" filepath="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-0.5.0+1/android/path_provider.iml" />
+      <module fileurl="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.3/android/shared_preferences.iml" filepath="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.4.3/android/shared_preferences.iml" />
+      <module fileurl="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.3/android/sqflite.iml" filepath="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.1.3/android/sqflite.iml" />
+      <module fileurl="file:///soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player-0.6.1/android/video_player.iml" filepath="/soft/android/android_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/video_player-0.6.1/android/video_player.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/android/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4db4a64..b2f4cd8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -60,7 +60,6 @@ repositories {
     }
 }
 dependencies {
-    implementation "com.github.GrenderG:Toasty:1.3.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     testImplementation 'junit:junit:4.12'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bcbb2d7..359ae97 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.example.flutterstudy">
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -21,7 +22,8 @@
         android:name="io.flutter.app.FlutterApplication"
         android:icon="@mipmap/lunch_yasuo"
         android:label="flutter_study"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
@@ -46,7 +48,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:screenOrientation="landscape" android:name=".MainActivityOragnal" android:theme="@style/Theme.AppCompat.Light"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/android/app/src/main/java/io/flutter/plugins/ToastyPlugin.java b/android/app/src/main/java/io/flutter/plugins/ToastyPlugin.java
deleted file mode 100644
index 3bf40de..0000000
--- a/android/app/src/main/java/io/flutter/plugins/ToastyPlugin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package io.flutter.plugins;
-
-/**
- * 作者:王飞
- * 邮箱:1276998208@qq.com
- * create on 2018/8/4 23:02
- */
-import android.content.Context;
-import android.widget.Toast;
-import es.dmoral.toasty.Toasty;
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
-import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
-
-/** ToastyPlugin */
-public class ToastyPlugin implements MethodCallHandler {
-
-    private Context context;
-
-    public ToastyPlugin(Context context) {
-        this.context = context;
-    }
-
-    /** Plugin registration. */
-    public static void registerWith(Registrar registrar) {
-        final MethodChannel channel = new MethodChannel(registrar.messenger(), "toasty");
-        channel.setMethodCallHandler(new ToastyPlugin((Context) registrar.context()));
-    }
-
-    @Override
-    public void onMethodCall(MethodCall call, Result result) {
-        String message = call.argument("message").toString();
-        if (call.method.equals("success")) {
-            Toasty.success(this.context, message, Toast.LENGTH_SHORT, true).show();
-
-        } else if (call.method.equals("info")) {
-            Toasty.info(this.context, message, Toast.LENGTH_SHORT, true).show();
-
-        } else if (call.method.equals("info")) {
-            Toasty.info(this.context, message, Toast.LENGTH_SHORT, true).show();
-
-        } else if (call.method.equals("warning")) {
-            Toasty.warning(this.context, message, Toast.LENGTH_SHORT, true).show();
-
-        } else if (call.method.equals("normal")) {
-            Toasty.normal(this.context, message, Toast.LENGTH_SHORT).show();
-
-        } else if (call.method.equals("error")) {
-            Toasty.error(this.context, message, Toast.LENGTH_SHORT, true).show();
-
-        } else {
-            result.notImplemented();
-        }
-    }
-}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/example/flutterstudy/MainActivity.kt b/android/app/src/main/kotlin/com/example/flutterstudy/MainActivity.kt
index 3a1c8b0..456d43d 100644
--- a/android/app/src/main/kotlin/com/example/flutterstudy/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/flutterstudy/MainActivity.kt
@@ -17,10 +17,10 @@ class MainActivity() : FlutterActivity() {
         MethodChannel(flutterView, CHANNEL).setMethodCallHandler(object : MethodCallHandler {
             override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
              //   if (call.method == "interaction") {
-                    val intent = Intent(this@MainActivity, MainActivityOragnal::class.java)
-                    intent.putExtra("putstr",call.method);
-                    this@MainActivity.startActivity(intent)
-                    result.success("success")
+//                    val intent = Intent(this@MainActivity, MainActivityOragnal::class.java)
+//                    intent.putExtra("putstr",call.method);
+//                    this@MainActivity.startActivity(intent)
+//                    result.success("success")
               /*  } else {
                     result.notImplemented()
                 }*/
diff --git a/android/gradlew b/android/gradlew
old mode 100644
new mode 100755
diff --git a/flutter_study.iml b/flutter_study.iml
index d327551..3bac7b1 100644
--- a/flutter_study.iml
+++ b/flutter_study.iml
@@ -1,13 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/connectivity/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/connectivity/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/connectivity/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/connectivity/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/connectivity/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/connectivity/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/device_info/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/device_info/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/device_info/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/device_info/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/device_info/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/device_info/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/fluttertoast/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/fluttertoast/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/fluttertoast/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/fluttertoast/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/fluttertoast/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/fluttertoast/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/image_picker/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/shared_preferences/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/video_player/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/video_player/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/video_player/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/video_player/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/video_player/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/video_player/example/build" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Dart Packages" level="project" />
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 4465189..106708f 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -20,6 +19,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		C944EA630AE3A455644105B5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D10779469D7C3E157C585FD /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -40,9 +40,9 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
+		3D10779469D7C3E157C585FD /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -63,16 +63,23 @@
 			files = (
 				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
 				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
+				C944EA630AE3A455644105B5 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		568E398DFF8B132F9D78E69D /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -89,6 +96,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
+				568E398DFF8B132F9D78E69D /* Pods */,
+				E5804C36ED1D218DFF87E8E1 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -123,6 +132,14 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		E5804C36ED1D218DFF87E8E1 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				3D10779469D7C3E157C585FD /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -130,12 +147,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				86A32EA77E71499D99D6E2B8 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				A5F63E85344683801F46185C /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -189,7 +208,6 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -211,6 +229,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
 		};
+		86A32EA77E71499D99D6E2B8 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -225,6 +265,48 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		A5F63E85344683801F46185C /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+				"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
+				"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
+				"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
+				"${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
+				"${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework",
+				"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
+				"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
+				"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
+				"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata
index 1d526a1..21a3cc1 100644
--- a/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>
diff --git a/lib/main.dart b/lib/main.dart
index 9d037e2..d47e6b5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -154,8 +154,7 @@ class MyLoginState extends State<MyLoginWidget>  with TickerProviderStateMixin{
     todoProvider.open(path);
   }
 
-  Future<bool> _Login(
-      String userName, String password, BuildContext context) async {
+  Future<bool> _Login(String userName, String password, BuildContext context) async {
     /*//数据库插入语句：
     Todo todo = new Todo();
     todo.title =userName;
@@ -163,6 +162,12 @@ class MyLoginState extends State<MyLoginWidget>  with TickerProviderStateMixin{
      todoProvider.insert(todo);
 
 */
+    Navigator.of(context).push(new PageRouteBuilder(
+      opaque: false,
+      pageBuilder: (BuildContext context, _, __) {
+        return new MyHomePager();
+      },
+    ));
     String url =
         "http://116.62.149.237:8080/USR000100001?usrName=$userName&passwd=$password";
     bool result;
diff --git a/pubspec.lock b/pubspec.lock
index b02266b..113c111 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -63,7 +63,7 @@ packages:
       name: convert
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.1"
   crypto:
     dependency: transitive
     description:
@@ -103,7 +103,14 @@ packages:
       name: flutter_cache_manager
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.0"
+    version: "0.3.2"
+  flutter_page_indicator:
+    dependency: transitive
+    description:
+      name: flutter_page_indicator
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.0.3"
   flutter_slidable:
     dependency: "direct main"
     description:
@@ -117,14 +124,14 @@ packages:
       name: flutter_staggered_grid_view
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.7"
   flutter_swiper:
     dependency: "direct main"
     description:
       name: flutter_swiper
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.5"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -136,7 +143,7 @@ packages:
       name: fluttertoast
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.3"
   http:
     dependency: "direct main"
     description:
@@ -157,7 +164,7 @@ packages:
       name: image_picker
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.5"
+    version: "0.4.12+1"
   intl:
     dependency: "direct main"
     description:
@@ -194,7 +201,7 @@ packages:
     source: hosted
     version: "1.6.2"
   path_provider:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: path_provider
       url: "https://pub.flutter-io.cn"
@@ -206,14 +213,14 @@ packages:
       name: pedantic
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   pull_to_refresh:
     dependency: "direct main"
     description:
       name: pull_to_refresh
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.5"
+    version: "1.1.6"
   quiver:
     dependency: transitive
     description:
@@ -227,7 +234,7 @@ packages:
       name: shared_preferences
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.3"
   shimmer:
     dependency: "direct main"
     description:
@@ -246,14 +253,14 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.5.4"
+    version: "1.5.5"
   sqflite:
     dependency: "direct main"
     description:
       name: sqflite
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.3"
   stack_trace:
     dependency: transitive
     description:
@@ -281,7 +288,7 @@ packages:
       name: synchronized
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2+1"
+    version: "2.1.0"
   term_glyph:
     dependency: transitive
     description:
@@ -296,6 +303,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.2"
+  transformer_page_view:
+    dependency: transitive
+    description:
+      name: transformer_page_view
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.5"
   transparent_image:
     dependency: "direct main"
     description:
@@ -332,5 +346,5 @@ packages:
     source: hosted
     version: "0.6.1"
 sdks:
-  dart: ">=2.1.0 <3.0.0"
-  flutter: ">=0.2.5 <2.0.0"
+  dart: ">=2.1.1-dev.0.0 <3.0.0"
+  flutter: ">=1.2.1 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 3993e04..823bf9e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,10 +15,9 @@ dependencies:
   transparent_image: "^0.1.0"
   flutter_swiper : "^1.0.2"
   charts_flutter: "^0.4.0"
-  path_provider: ^0.5.0+1
   cached_network_image: "0.6.0"
   sqflite: ^1.1.0
-  pull_to_refresh: "^1.1.5"
+  pull_to_refresh: ^1.1.6
   video_player: "0.6.1"
   collection: 1.14.11
   device_info: 0.2.1

From 32177de1520bd7c5a9c9e7656fc570f69b815de4 Mon Sep 17 00:00:00 2001
From: luhenchang <1276998208@qq.com>
Date: Fri, 6 Sep 2019 14:45:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A7=94=E5=A9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flutter_study.iml                    |  3 +++
 ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------
 pubspec.lock                         | 16 ++++++++--------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/flutter_study.iml b/flutter_study.iml
index 3bac7b1..950e920 100644
--- a/flutter_study.iml
+++ b/flutter_study.iml
@@ -14,6 +14,9 @@
       <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/flutter_class/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/flutter_class/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/flutter_class/build" />
       <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/connectivity/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/connectivity/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/connectivity/build" />
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 106708f..0c98417 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		18BA1AF95986B041886AA83D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		3D10779469D7C3E157C585FD /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -49,6 +50,7 @@
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
+		9770EC2943A0469C38E8EC64 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -73,6 +75,8 @@
 		568E398DFF8B132F9D78E69D /* Pods */ = {
 			isa = PBXGroup;
 			children = (
+				9770EC2943A0469C38E8EC64 /* Pods-Runner.debug.xcconfig */,
+				18BA1AF95986B041886AA83D /* Pods-Runner.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -270,10 +274,8 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
 				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
@@ -287,8 +289,6 @@
 				"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
@@ -304,7 +304,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
diff --git a/pubspec.lock b/pubspec.lock
index 113c111..7cd87bc 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,5 +1,5 @@
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
   async:
     dependency: transitive
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.8"
+    version: "2.2.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -185,7 +185,7 @@ packages:
       name: matcher
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.3+1"
+    version: "0.12.5"
   meta:
     dependency: transitive
     description:
@@ -213,7 +213,7 @@ packages:
       name: pedantic
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.5.0"
+    version: "1.7.0"
   pull_to_refresh:
     dependency: "direct main"
     description:
@@ -227,7 +227,7 @@ packages:
       name: quiver
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.3"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -274,7 +274,7 @@ packages:
       name: stream_channel
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.8"
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
@@ -302,7 +302,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.5"
   transformer_page_view:
     dependency: transitive
     description:
@@ -346,5 +346,5 @@ packages:
     source: hosted
     version: "0.6.1"
 sdks:
-  dart: ">=2.1.1-dev.0.0 <3.0.0"
+  dart: ">=2.2.2 <3.0.0"
   flutter: ">=1.2.1 <2.0.0"

From 3dda39dc1c399bd83b298510f9101007df9b29d1 Mon Sep 17 00:00:00 2001
From: luhenchang <1276998208@qq.com>
Date: Fri, 6 Sep 2019 14:46:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A7=94=E5=A9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pubspec.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pubspec.yaml b/pubspec.yaml
index 823bf9e..1497aa4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,6 +27,7 @@ dependencies:
   shimmer: ^0.0.4
   flutter_staggered_grid_view:
   flutter_slidable: "^0.4.9"
+
 dev_dependencies:
 
   flutter_test: