Kaynağa Gözat

修复注解报错

Kevin 5 yıl önce
ebeveyn
işleme
f498d96bee

+ 34 - 34
.idea/workspace.xml

@@ -2,11 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="cef19225-ccb5-4e06-af53-e383e247fd01" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/android/src/main/java/info/geteasy/flutter_bluetooth/ConnectedHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/info/geteasy/flutter_bluetooth/ConnectedHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/src/main/java/info/geteasy/flutter_bluetooth/ConnectedThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/info/geteasy/flutter_bluetooth/ConnectedThread.java" 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/bluetooth_socket.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/bluetooth_socket.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/info/geteasy/flutter_bluetooth/FlutterBluetoothPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/info/geteasy/flutter_bluetooth/FlutterBluetoothPlugin.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.dart_tool/" />
     <ignored path="$PROJECT_DIR$/.idea/" />
@@ -20,7 +17,11 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="192.168.0.12:5555" />
+  <component name="DefaultGradleProjectSettings">
+    <option name="testRunner" value="GRADLE" />
+    <option name="delegatedBuild" value="true" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="69DDU16528001447" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
@@ -40,8 +41,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/flutter_bluetooth/FlutterBluetoothPlugin.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-912">
-              <caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
+            <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>
@@ -70,8 +71,8 @@
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1912" />
-    <option name="y" value="-8" />
+    <option name="x" value="-112" />
+    <option name="y" value="273" />
     <option name="width" value="1936" />
     <option name="height" value="1056" />
   </component>
@@ -81,50 +82,50 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane">
+      <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="flutter_bluetooth" type="58d84e3e:PackageViewProjectNode" />
-              <item name="flutter_bluetooth" type="616d4139:PackageViewModuleNode" />
+              <item name="flutter_bluetooth" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_bluetooth" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="flutter_bluetooth" type="58d84e3e:PackageViewProjectNode" />
-              <item name="flutter_bluetooth_android" type="616d4139:PackageViewModuleNode" />
+              <item name="flutter_bluetooth" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_bluetooth" type="462c0819:PsiDirectoryNode" />
+              <item name="android" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="flutter_bluetooth" type="58d84e3e:PackageViewProjectNode" />
-              <item name="flutter_bluetooth_android" type="616d4139:PackageViewModuleNode" />
-              <item name="info.geteasy.flutter_bluetooth" type="1f31426a:PackageElementNode" />
+              <item name="flutter_bluetooth" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_bluetooth" type="462c0819:PsiDirectoryNode" />
+              <item name="android" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="ProjectPane">
+      <pane id="PackagesPane">
         <subPane>
           <expand>
             <path>
-              <item name="flutter_bluetooth" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_bluetooth" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_bluetooth" type="58d84e3e:PackageViewProjectNode" />
+              <item name="flutter_bluetooth" type="616d4139:PackageViewModuleNode" />
             </path>
             <path>
-              <item name="flutter_bluetooth" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_bluetooth" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_bluetooth" type="58d84e3e:PackageViewProjectNode" />
+              <item name="flutter_bluetooth_android" type="616d4139:PackageViewModuleNode" />
             </path>
             <path>
-              <item name="flutter_bluetooth" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_bluetooth" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_bluetooth" type="58d84e3e:PackageViewProjectNode" />
+              <item name="flutter_bluetooth_android" type="616d4139:PackageViewModuleNode" />
+              <item name="info.geteasy.flutter_bluetooth" type="1f31426a:PackageElementNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="AndroidView" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -159,8 +160,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25586355" />
       <window_info id="Captures" order="1" side_tool="true" />
@@ -205,8 +205,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/android/src/main/java/info/geteasy/flutter_bluetooth/FlutterBluetoothPlugin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-912">
-          <caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
+        <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>

+ 5 - 9
android/src/main/java/info/geteasy/flutter_bluetooth/FlutterBluetoothPlugin.java

@@ -11,8 +11,6 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.ParcelUuid;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
 
 import java.io.IOException;
 import java.lang.reflect.Array;
@@ -67,7 +65,7 @@ public class FlutterBluetoothPlugin implements FlutterPlugin, MethodCallHandler,
   }
 
   @Override
-  public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
+  public void onAttachedToEngine(FlutterPluginBinding flutterPluginBinding) {
     this.flutterPluginBinding = flutterPluginBinding;
   }
 
@@ -91,7 +89,7 @@ public class FlutterBluetoothPlugin implements FlutterPlugin, MethodCallHandler,
   }
 
   @Override
-  public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBinding) {
+  public void onAttachedToActivity(ActivityPluginBinding activityPluginBinding) {
     if(mInstance == null){
       mInstance = new FlutterBluetoothPlugin(flutterPluginBinding.getFlutterEngine().getDartExecutor(), activityPluginBinding.getActivity());
     }
@@ -105,7 +103,7 @@ public class FlutterBluetoothPlugin implements FlutterPlugin, MethodCallHandler,
   }
 
   @Override
-  public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding activityPluginBinding) {
+  public void onReattachedToActivityForConfigChanges(ActivityPluginBinding activityPluginBinding) {
     onAttachedToActivity(activityPluginBinding);
   }
 
@@ -114,9 +112,8 @@ public class FlutterBluetoothPlugin implements FlutterPlugin, MethodCallHandler,
 
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
   @Override
-  public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
+  public void onMethodCall(MethodCall call, Result result) {
     if (call.method.equals("isEnabled")) {
       result.success(this.isEnabled());
     } else if(call.method.equals("enabled")){
@@ -165,7 +162,7 @@ public class FlutterBluetoothPlugin implements FlutterPlugin, MethodCallHandler,
   }
 
   @Override
-  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+  public void onDetachedFromEngine(FlutterPluginBinding binding) {
     this.flutterPluginBinding = null;
   }
 
@@ -202,7 +199,6 @@ public class FlutterBluetoothPlugin implements FlutterPlugin, MethodCallHandler,
     return result;
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
   public  boolean createBond(String address){
     return getDevice(address).createBond();
   }