From 1737b42e93862e748c8b83e1cdeef7b25a3c2c79 Mon Sep 17 00:00:00 2001 From: Hanyu Huang Date: Mon, 20 Feb 2023 23:52:37 +0800 Subject: [PATCH 1/3] add cut paper --- ios/Classes/BluetoothPrintPlugin.m | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/Classes/BluetoothPrintPlugin.m b/ios/Classes/BluetoothPrintPlugin.m index d820920ad..89a835554 100644 --- a/ios/Classes/BluetoothPrintPlugin.m +++ b/ios/Classes/BluetoothPrintPlugin.m @@ -245,6 +245,7 @@ -(NSData *)mapToEscCommand:(NSDictionary *) args { } [command addPrintAndFeedLines:4]; + [command addCutPaper:0]; return [command getCommand]; } From b623e9b60d8d26183064cc4664cbaf0090d7027a Mon Sep 17 00:00:00 2001 From: Kix Date: Mon, 2 Oct 2023 17:21:26 +0800 Subject: [PATCH 2/3] fix linefeed and add cut paper control --- example/.flutter-plugins-dependencies | 2 +- example/pubspec.lock | 113 +++++++++++++++----------- ios/Classes/BluetoothPrintPlugin.m | 10 ++- 3 files changed, 75 insertions(+), 50 deletions(-) diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 72bf61fbe..8b25f89d8 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"bluetooth_print","path":"D:\\\\workspace\\\\bluetooth_print\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"bluetooth_print","path":"D:\\\\workspace\\\\bluetooth_print\\\\","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"bluetooth_print","dependencies":[]}],"date_created":"2022-10-28 11:02:04.109552","version":"3.0.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"bluetooth_print","path":"/Users/kix/Codes/bluetooth_print/","native_build":true,"dependencies":[]}],"android":[{"name":"bluetooth_print","path":"/Users/kix/Codes/bluetooth_print/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"bluetooth_print","dependencies":[]}],"date_created":"2023-10-01 16:53:43.751522","version":"3.7.12"} \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 2c04b4b6f..6052f269a 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,65 +5,65 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.10.0" bluetooth_print: dependency: "direct dev" description: path: ".." relative: true source: path - version: "4.1.0" + version: "4.2.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" 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" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: a937da4c006989739ceb4d10e3bd6cce64ca85d0fe287fc5b2b9f6ee757dcee6 + url: "https://pub.dev" source: hosted version: "0.1.3" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -74,46 +74,60 @@ packages: description: flutter source: sdk version: "0.0.0" + js: + dependency: transitive + description: + name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" + source: hosted + version: "0.6.5" json_annotation: dependency: transitive description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: "3520fa844009431b5d4491a5a778603520cdc399ab3406332dcc50f93547258c" + url: "https://pub.dev" source: hosted version: "4.7.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.2" rxdart: dependency: transitive description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "5d22055fd443806c03ef24a02000637cf51eae49c2a0168d38a43fc166b0209c" + url: "https://pub.dev" source: hosted version: "0.27.5" sky_engine: @@ -125,51 +139,58 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "0.4.16" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" sdks: - dart: ">=2.17.0 <3.0.0" + dart: ">=2.18.0 <3.0.0" flutter: ">=1.12.13+hotfix.6" diff --git a/ios/Classes/BluetoothPrintPlugin.m b/ios/Classes/BluetoothPrintPlugin.m index 89a835554..9c1416d19 100644 --- a/ios/Classes/BluetoothPrintPlugin.m +++ b/ios/Classes/BluetoothPrintPlugin.m @@ -186,7 +186,7 @@ -(NSData *)mapToEscCommand:(NSDictionary *) args { EscCommand *command = [[EscCommand alloc]init]; [command addInitializePrinter]; - [command addPrintAndFeedLines:3]; + // [command addPrintAndFeedLines:1]; for(NSDictionary *m in list){ @@ -244,8 +244,12 @@ -(NSData *)mapToEscCommand:(NSDictionary *) args { } - [command addPrintAndFeedLines:4]; - [command addCutPaper:0]; + if([[config objectForKey:@"cut"] isEqualToNumber:@1]){ + [command addCutPaperAndFeed:1]; + } else { + [command addPrintAndLineFeed]; + } + return [command getCommand]; } From 746ed328253777e065cf3aceac2fab918494dcb3 Mon Sep 17 00:00:00 2001 From: Kix Date: Sat, 7 Oct 2023 21:01:00 +0800 Subject: [PATCH 3/3] ignore .flutter-plugins-dependencies --- .gitignore | 2 ++ example/.flutter-plugins-dependencies | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 example/.flutter-plugins-dependencies diff --git a/.gitignore b/.gitignore index ea6936467..2544b8783 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ pubspec.lock build/ + +.flutter-plugins-dependencies \ No newline at end of file diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies deleted file mode 100644 index 8b25f89d8..000000000 --- a/example/.flutter-plugins-dependencies +++ /dev/null @@ -1 +0,0 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"bluetooth_print","path":"/Users/kix/Codes/bluetooth_print/","native_build":true,"dependencies":[]}],"android":[{"name":"bluetooth_print","path":"/Users/kix/Codes/bluetooth_print/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"bluetooth_print","dependencies":[]}],"date_created":"2023-10-01 16:53:43.751522","version":"3.7.12"} \ No newline at end of file