添加了对Flutter 1.12的适配

.idea/workspace.xml

@@ -13,23 +13,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="4806c2d7-b21b-41c1-aa66-292cead64806" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/android/gradle.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeThread.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/FqreaderPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/FqreaderPlugin.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/ScanView.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/ScanView.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/android/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/android/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/gradle.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/android/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/fqreader.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/fqreader.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/scan_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/scan_view.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.dart_tool/" />
@@ -47,79 +35,111 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="69DDU16528001447" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="DXLNW18911008317" />
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/android/build.gradle">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="186">
-              <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="28" selection-end-column="75" />
+            <state relative-caret-position="38">
+              <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/android/build.gradle">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="152">
-              <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="404">
+                <caret line="27" column="21" selection-start-line="27" selection-start-column="21" selection-end-line="27" selection-end-column="21" />
+              </first_editor>
+              <second_editor>
+                <markdownNavigatorState />
+              </second_editor>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/android/fqreader.iml">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/ScanView.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="200">
+              <caret line="161" column="44" lean-forward="true" selection-start-line="161" selection-start-column="44" selection-end-line="161" selection-end-column="44" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/android/gradle.properties">
+        <entry file="file://$PROJECT_DIR$/example/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="38">
-              <caret line="2" column="24" lean-forward="true" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
+            <state relative-caret-position="437">
+              <caret line="23" column="25" selection-start-line="23" selection-start-column="25" selection-end-line="23" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/android/local.properties">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeHandler.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1074">
+              <caret line="72" column="27" lean-forward="true" selection-start-line="72" selection-start-column="27" selection-end-line="72" selection-end-column="27" />
+              <folding>
+                <element signature="e#2210#2211#0" expanded="true" />
+                <element signature="e#2255#2256#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/android/settings.gradle">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/FqreaderPlugin.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="145">
+              <caret line="83" column="36" selection-start-line="83" selection-start-column="36" selection-end-line="83" selection-end-column="36" />
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/android/app/build.gradle">
+        <entry file="jar://G:/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar!/io/flutter/embedding/engine/FlutterEngine.class">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="190">
-              <caret line="37" column="27" lean-forward="true" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
+            <state relative-caret-position="485">
+              <caret line="135" column="20" selection-start-line="135" selection-start-column="20" selection-end-line="135" selection-end-column="20" />
+              <folding>
+                <element signature="e#5904#5905#0" expanded="true" />
+                <element signature="e#5940#5941#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://G:/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar!/io/flutter/embedding/engine/renderer/FlutterRenderer.class">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="38">
-              <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+            <state relative-caret-position="133">
+              <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/android/local.properties">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="jar://G:/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar!/io/flutter/plugin/common/PluginRegistry.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="174">
+              <caret line="53" column="23" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="23" />
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/example/android/gradle.properties">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="76">
-              <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+              <caret line="4" selection-start-line="4" selection-end-line="4" />
             </state>
           </provider>
         </entry>
@@ -146,6 +166,7 @@
       <find>Conso</find>
       <find>run</find>
       <find>initView</find>
+      <find>FqreaderPlugin</find>
     </findStrings>
     <replaceStrings>
       <replace>Fqreader._</replace>
@@ -167,19 +188,19 @@
         <option value="$PROJECT_DIR$/ios/Classes/FqreaderPlugin.m" />
         <option value="$PROJECT_DIR$/lib/ScanView.dart" />
         <option value="$PROJECT_DIR$/example/lib/scan_view.dart" />
-        <option value="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeHandler.java" />
         <option value="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeThread.java" />
-        <option value="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/ScanView.java" />
-        <option value="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/FqreaderPlugin.java" />
         <option value="$PROJECT_DIR$/lib/scan_view.dart" />
         <option value="$PROJECT_DIR$/lib/fqreader.dart" />
         <option value="$PROJECT_DIR$/example/lib/main.dart" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/android/gradle.properties" />
         <option value="$PROJECT_DIR$/android/build.gradle" />
         <option value="$PROJECT_DIR$/example/android/app/build.gradle" />
+        <option value="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/FqreaderPlugin.java" />
+        <option value="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/ScanView.java" />
+        <option value="$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeHandler.java" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -221,27 +242,56 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
+      <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="flutter-fqreader" type="58d84e3e:PackageViewProjectNode" />
-              <item name="fqreader" type="616d4139:PackageViewModuleNode" />
+              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="flutter-fqreader" type="58d84e3e:PackageViewProjectNode" />
-              <item name="fqreader_android" type="616d4139:PackageViewModuleNode" />
+              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
+              <item name="android" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="flutter-fqreader" type="58d84e3e:PackageViewProjectNode" />
-              <item name="fqreader_android" type="616d4139:PackageViewModuleNode" />
-              <item name="info.geteasy" type="1f31426a:PackageElementNode" />
+              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
+              <item name="android" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="flutter-fqreader" type="58d84e3e:PackageViewProjectNode" />
-              <item name="fqreader_android" type="616d4139:PackageViewModuleNode" />
-              <item name="info.geteasy" type="1f31426a:PackageElementNode" />
-              <item name="fqreader" type="1f31426a:PackageElementNode" />
+              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
+              <item name="example" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
+              <item name="example" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
+              <item name="ios" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
+              <item name="ios" type="462c0819:PsiDirectoryNode" />
+              <item name="Assets" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
+              <item name="ios" type="462c0819:PsiDirectoryNode" />
+              <item name="Classes" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -290,6 +340,32 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="flutter-fqreader" type="58d84e3e:PackageViewProjectNode" />
+              <item name="fqreader" type="616d4139:PackageViewModuleNode" />
+            </path>
+            <path>
+              <item name="flutter-fqreader" type="58d84e3e:PackageViewProjectNode" />
+              <item name="fqreader_android" type="616d4139:PackageViewModuleNode" />
+            </path>
+            <path>
+              <item name="flutter-fqreader" type="58d84e3e:PackageViewProjectNode" />
+              <item name="fqreader_android" type="616d4139:PackageViewModuleNode" />
+              <item name="info.geteasy" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="flutter-fqreader" type="58d84e3e:PackageViewProjectNode" />
+              <item name="fqreader_android" type="616d4139:PackageViewModuleNode" />
+              <item name="info.geteasy" type="1f31426a:PackageElementNode" />
+              <item name="fqreader" type="1f31426a:PackageElementNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -319,75 +395,71 @@
             <path>
               <item name="flutter-fqreader" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
               <item name="G:\Lib\Flutter\flutter-fqreader" type="442cc68d:ScopeViewTreeModel$RootNode" />
-              <item name="example" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="android" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
             <path>
               <item name="flutter-fqreader" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
               <item name="G:\Lib\Flutter\flutter-fqreader" type="442cc68d:ScopeViewTreeModel$RootNode" />
-              <item name="example" type="9f88c78c:ScopeViewTreeModel$FileNode" />
               <item name="android" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="main" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
             <path>
               <item name="flutter-fqreader" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
               <item name="G:\Lib\Flutter\flutter-fqreader" type="442cc68d:ScopeViewTreeModel$RootNode" />
-              <item name="example" type="9f88c78c:ScopeViewTreeModel$FileNode" />
               <item name="android" type="9f88c78c:ScopeViewTreeModel$FileNode" />
-              <item name="app" type="9f88c78c:ScopeViewTreeModel$FileNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="main" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="java" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
             <path>
-              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter-fqreader" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="G:\Lib\Flutter\flutter-fqreader" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="android" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="main" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="java" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="info" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
             <path>
-              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter-fqreader" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="G:\Lib\Flutter\flutter-fqreader" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="android" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="main" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="java" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="info" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="geteasy" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
             <path>
-              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
-              <item name="ios" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter-fqreader" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="G:\Lib\Flutter\flutter-fqreader" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="android" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="src" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="main" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="java" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="info" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="geteasy" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="fqreader" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
             <path>
-              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
-              <item name="ios" type="462c0819:PsiDirectoryNode" />
-              <item name="Assets" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter-fqreader" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="G:\Lib\Flutter\flutter-fqreader" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="example" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
             <path>
-              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
-              <item name="ios" type="462c0819:PsiDirectoryNode" />
-              <item name="Classes" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter-fqreader" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="G:\Lib\Flutter\flutter-fqreader" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="example" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="android" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
             <path>
-              <item name="flutter-fqreader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter-fqreader" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter-fqreader" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="G:\Lib\Flutter\flutter-fqreader" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="example" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="android" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="app" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
           </expand>
           <select />
@@ -467,7 +539,7 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14552239" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1453125" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
@@ -478,14 +550,14 @@
       <window_info id="Resources Explorer" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6231343" visible="true" weight="0.36008677" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4968017" weight="0.3995657" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6231343" weight="0.36008677" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49635416" visible="true" weight="0.3993644" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49946696" weight="0.32899022" />
       <window_info anchor="bottom" id="Dart Analysis" order="7" />
       <window_info anchor="bottom" id="Android Profiler" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.37686568" side_tool="true" visible="true" weight="0.36008677" />
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50364584" side_tool="true" visible="true" weight="0.3993644" />
       <window_info anchor="bottom" id="Logcat" order="10" sideWeight="0.49946696" weight="0.32899022" />
       <window_info anchor="bottom" id="Version Control" order="11" show_stripe_button="false" />
       <window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.49840087" weight="0.3286334" />
@@ -539,27 +611,6 @@
     </layout-to-restore>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://G:/flutter/packages/flutter/lib/src/widgets/texture.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="627">
-          <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://G:/flutter/packages/flutter/lib/src/widgets/text.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="174">
-          <caret line="224" column="12" selection-start-line="224" selection-start-column="12" selection-end-line="224" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://G:/flutter/packages/flutter/lib/src/foundation/diagnostics.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-282">
-          <caret line="2114" column="15" selection-start-line="2114" selection-start-column="15" selection-end-line="2114" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://G:/flutter/packages/flutter/lib/src/widgets/framework.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-7">
@@ -622,13 +673,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="23" column="25" selection-start-line="23" selection-start-column="25" selection-end-line="23" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/ios/Classes/FqreaderPlugin.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="76">
@@ -726,19 +770,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="285">
-            <caret line="15" column="14" selection-start-line="15" selection-start-column="14" selection-end-line="15" selection-end-column="14" />
-          </first_editor>
-          <second_editor>
-            <markdownNavigatorState />
-          </second_editor>
-        </state>
-      </provider>
-      <provider editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="760">
@@ -746,23 +777,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/FqreaderPlugin.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1520">
-          <caret line="110" column="35" selection-start-line="110" selection-start-column="27" selection-end-line="110" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="646">
-          <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-          <folding>
-            <element signature="method#registerEventChannel#0;class#DecodeHandler#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeThread.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1330">
@@ -777,16 +791,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/ScanView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="119" column="21" lean-forward="true" selection-start-line="119" selection-start-column="21" selection-end-line="119" selection-end-column="21" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
         <state split_layout="SPLIT">
@@ -814,50 +818,110 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/settings.gradle">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/android/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="513">
+          <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="28" selection-end-column="75" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/android/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
+        </state>
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/android/fqreader.iml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/android/gradle.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="38">
+          <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/android/local.properties">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/build.gradle">
+    <entry file="file://$PROJECT_DIR$/android/settings.gradle">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/android/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="28" selection-end-column="75" />
+        <state relative-caret-position="703">
+          <caret line="37" column="27" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/example/android/local.properties">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/gradle.properties">
+    <entry file="file://$PROJECT_DIR$/example/android/gradle.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="2" column="24" lean-forward="true" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
+        <state relative-caret-position="76">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/gradle.properties">
+    <entry file="jar://G:/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar!/io/flutter/embedding/engine/renderer/FlutterRenderer.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+        <state relative-caret-position="133">
+          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/build.gradle">
+    <entry file="jar://G:/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar!/io/flutter/embedding/engine/FlutterEngine.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
+        <state relative-caret-position="485">
+          <caret line="135" column="20" selection-start-line="135" selection-start-column="20" selection-end-line="135" selection-end-column="20" />
+          <folding>
+            <element signature="e#5904#5905#0" expanded="true" />
+            <element signature="e#5940#5941#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/build.gradle">
+    <entry file="jar://G:/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar!/io/flutter/plugin/common/PluginRegistry.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="37" column="27" lean-forward="true" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
+        <state relative-caret-position="174">
+          <caret line="53" column="23" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/FqreaderPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="145">
+          <caret line="83" column="36" selection-start-line="83" selection-start-column="36" selection-end-line="83" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/DecodeHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1074">
+          <caret line="72" column="27" lean-forward="true" selection-start-line="72" selection-start-column="27" selection-end-line="72" selection-end-column="27" />
+          <folding>
+            <element signature="e#2210#2211#0" expanded="true" />
+            <element signature="e#2255#2256#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/fqreader/ScanView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="161" column="44" lean-forward="true" selection-start-line="161" selection-start-column="44" selection-end-line="161" selection-end-column="44" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="437">
+          <caret line="23" column="25" selection-start-line="23" selection-start-column="25" selection-end-line="23" selection-end-column="25" />
         </state>
       </provider>
     </entry>
@@ -868,5 +932,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="404">
+            <caret line="27" column="21" selection-start-line="27" selection-start-column="21" selection-end-line="27" selection-end-column="21" />
+          </first_editor>
+          <second_editor>
+            <markdownNavigatorState />
+          </second_editor>
+        </state>
+      </provider>
+      <provider editor-type-id="text-editor" />
+    </entry>
   </component>
 </project>

CHANGELOG.md

@@ -22,4 +22,8 @@
 ## 0.1.5
 
 * 添加了条码的竖扫描
+
+## 0.2.1
+
+* 添加了对Flutter 1.12的适配
   

android/src/main/java/info/geteasy/fqreader/DecodeHandler.java

@@ -7,6 +7,7 @@ import android.os.Message;
 
 import java.util.List;
 
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugin.common.PluginRegistry;
 
@@ -55,9 +56,9 @@ public class DecodeHandler extends Handler implements  Camera.PreviewCallback {
     /**
      * 注册通知事件
      */
-    void registerEventChannel(PluginRegistry.Registrar registrar, long textureEntryId) {
+    void registerEventChannel(BinaryMessenger messenger, long textureEntryId) {
         new EventChannel(
-                registrar.messenger(), "fqreader/scanEvents" + textureEntryId)
+                messenger, "fqreader/scanEvents" + textureEntryId)
                 .setStreamHandler(
                         new EventChannel.StreamHandler() {
                             @Override

android/src/main/java/info/geteasy/fqreader/FqreaderPlugin.java

@@ -24,6 +24,8 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -35,18 +37,23 @@ import io.flutter.view.TextureRegistry;
 /**
  * FqreaderPlugin
  */
-public class FqreaderPlugin implements MethodCallHandler {
+public class FqreaderPlugin implements MethodCallHandler, FlutterPlugin {
 
 
-    private FlutterView view;
+    private TextureRegistry textureRegistry;
     private Activity activity;
-    private Registrar registrar;
+    private BinaryMessenger messenger;
+    private static MethodChannel channel;
 
     private ScanView scanView;
 
-    private FqreaderPlugin(Registrar registrar, FlutterView view, Activity activity) {
-        this.registrar = registrar;
-        this.view = view;
+    public FqreaderPlugin(){}
+
+    private FqreaderPlugin(
+            BinaryMessenger messenger,
+            TextureRegistry textureRegistry, Activity activity) {
+        this.messenger = messenger;
+        this.textureRegistry = textureRegistry;
         this.activity = activity;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (activity.checkSelfPermission(Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
@@ -59,10 +66,10 @@ public class FqreaderPlugin implements MethodCallHandler {
      * Plugin registration.
      */
     public static void registerWith(Registrar registrar) {
-        final MethodChannel channel = new MethodChannel(registrar.messenger(), "fqreader");
+        channel = new MethodChannel(registrar.messenger(), "fqreader");
 
         channel.setMethodCallHandler(
-                new FqreaderPlugin(registrar, registrar.view(), registrar.activity()));
+                new FqreaderPlugin(registrar.messenger(), registrar.view(), registrar.activity()));
     }
 
     @Override
@@ -74,7 +81,7 @@ public class FqreaderPlugin implements MethodCallHandler {
                     return;
                 }
                 List<String> scanType = call.argument("scanType");
-                scanView = new ScanView(view, registrar,
+                scanView = new ScanView(textureRegistry, messenger, activity,
                         scanType,
                         result);
                 break;
@@ -164,4 +171,16 @@ public class FqreaderPlugin implements MethodCallHandler {
         }
     }
 
+    @Override
+    public void onAttachedToEngine(FlutterPluginBinding flutterPluginBinding) {
+        flutterPluginBinding.getFlutterEngine().
+        channel = new MethodChannel(flutterPluginBinding.getFlutterEngine().getDartExecutor(), "fqreader");
+        flutterPluginBinding.getFlutterEngine().getRenderer()
+        channel.setMethodCallHandler(new FqreaderPlugin(flutterPluginBinding.getFlutterEngine().));
+    }
+
+    @Override
+    public void onDetachedFromEngine(FlutterPluginBinding flutterPluginBinding) {
+
+    }
 }

android/src/main/java/info/geteasy/fqreader/ScanView.java

@@ -1,5 +1,6 @@
 package info.geteasy.fqreader;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Rect;
@@ -30,6 +31,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
@@ -45,8 +47,9 @@ public class ScanView {
     private Camera mCamera;
     private DecodeHandler mDecodeHandler;
 
-    ScanView(FlutterView view,
-             PluginRegistry.Registrar registrar,
+    ScanView(TextureRegistry textureRegistry,
+             BinaryMessenger messenger,
+             Activity activity,
              List<String> scanType,
              MethodChannel.Result result) {
         try {
@@ -54,8 +57,7 @@ public class ScanView {
             Camera.Parameters param = mCamera.getParameters();
             param.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
             param.setRotation(90);
-            Context context = view.getContext();
-            DisplayMetrics dm = context.getResources().getDisplayMetrics();
+            DisplayMetrics dm = activity.getResources().getDisplayMetrics();
             // 选择最合适的预览图像大小
             Camera.Size currentSize = matchSize(dm.heightPixels, dm.widthPixels, param);
             // 设置预览图像大小
@@ -64,7 +66,7 @@ public class ScanView {
             mCamera.setDisplayOrientation(90); //旋转90度,变成竖屏
 
             //链接flutter纹理
-            this.textureEntry = view.createSurfaceTexture();
+            this.textureEntry = textureRegistry.createSurfaceTexture();
             mCamera.setPreviewTexture(textureEntry.surfaceTexture());
             
             HashMap<String, Object> resultMap = new HashMap<String, Object>();
@@ -75,7 +77,7 @@ public class ScanView {
             result.success(resultMap);
 
             mDecodeHandler = new DecodeHandler(mCamera, scanType);
-            mDecodeHandler.registerEventChannel(registrar, textureEntry.id());
+            mDecodeHandler.registerEventChannel(messenger, textureEntry.id());
 
         } catch (Exception e) {
             result.error("ScanView init", e.getMessage(), null);

pubspec.yaml

@@ -1,6 +1,6 @@
 name: fqreader
 description: A highly customizable Scan Widget 
-version: 0.2.0
+version: 0.2.1
 author: Kevin <liangkaikevin@gmail.com>
 homepage: https://github.com/Im-Kevin/cool_ui