From 039bc25adec7d2710a78f23f36b2ed61bae79d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=90=8C?= <494089941@qq.com>
Date: Fri, 23 Sep 2022 15:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A7=E7=89=88=E6=89=93=E5=8D=B0=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 19 +++++++-----
 .../com/dj/printer/dj_printer/Blutooth.java   |  4 ++-
 .../printer/dj_printer/DjPrinterPlugin.java   |  2 ++
 example/pubspec.lock                          | 29 +++++++------------
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d3293b9..b1f51f7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="2f8e3712-04e2-429a-bcea-c8db1a54008e" name="默认变更列表" comment="" />
+    <list default="true" id="2f8e3712-04e2-429a-bcea-c8db1a54008e" name="默认变更列表" comment="">
+      <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/com/dj/printer/dj_printer/Blutooth.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/dj/printer/dj_printer/Blutooth.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/src/main/java/com/dj/printer/dj_printer/DjPrinterPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/src/main/java/com/dj/printer/dj_printer/DjPrinterPlugin.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -55,13 +60,13 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "dart.analysis.tool.window.visible": "false",
-    "io.flutter.reload.alreadyRun": "true",
-    "show.migrate.to.gradle.popup": "false"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;,
+    &quot;io.flutter.reload.alreadyRun&quot;: &quot;true&quot;,
+    &quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot;
   }
-}]]></component>
+}</component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="默认任务">
diff --git a/android/src/main/java/com/dj/printer/dj_printer/Blutooth.java b/android/src/main/java/com/dj/printer/dj_printer/Blutooth.java
index 85e66b0..a38fc25 100644
--- a/android/src/main/java/com/dj/printer/dj_printer/Blutooth.java
+++ b/android/src/main/java/com/dj/printer/dj_printer/Blutooth.java
@@ -155,7 +155,7 @@ public class Blutooth {
 
     public void btConn(final String address) throws IOException {
 //        bluetoothPort.connect(address);
-
+            System.out.println("btConn");
         new connBT().execute(address);
     }
 
@@ -240,9 +240,11 @@ public class Blutooth {
 
             try {
                 bluetoothPort.connect(strings[0]);
+                System.out.println("connBT "+strings[0]);
                 retVal = Integer.valueOf(0);
             } catch (IOException e) {
                 e.printStackTrace();
+                System.out.println("connBt"+e.toString());
                 retVal = Integer.valueOf(-1);
             }
 
diff --git a/android/src/main/java/com/dj/printer/dj_printer/DjPrinterPlugin.java b/android/src/main/java/com/dj/printer/dj_printer/DjPrinterPlugin.java
index 9ab9729..4f60bd5 100644
--- a/android/src/main/java/com/dj/printer/dj_printer/DjPrinterPlugin.java
+++ b/android/src/main/java/com/dj/printer/dj_printer/DjPrinterPlugin.java
@@ -31,6 +31,7 @@ public class DjPrinterPlugin implements FlutterPlugin, MethodCallHandler {
     private static final String CONNECT = "com.connect";
 
     Blutooth blutooth = new Blutooth();
+    private Result re;
 
     @Override
     public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
@@ -71,6 +72,7 @@ public class DjPrinterPlugin implements FlutterPlugin, MethodCallHandler {
         } else if (call.method.equals("connect")) {
             String arg = call.argument("address");
             try {
+                System.out.println("打印机连接");
                 blutooth.btConn(arg);
                 result.success(true);
             } catch (IOException e) {
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 3d9865d..d5bce16 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -42,21 +42,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
@@ -84,7 +77,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -122,28 +115,28 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   permission_handler:
     dependency: "direct main"
     description:
@@ -204,7 +197,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
   stack_trace:
     dependency: transitive
     description:
@@ -225,21 +218,21 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.12"
   vector_math:
     dependency: transitive
     description: