feat: count for tsc command

thon-ju · Sep 19, 2023 · a24f4ce · a24f4ce
1 parent a6c1583
commit a24f4ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/android/src/main/java/com/example/bluetooth_print/PrintContent.java b/android/src/main/java/com/example/bluetooth_print/PrintContent.java
@@ -122,6 +122,7 @@ public static Vector<Byte> mapToReceipt(Map<String,Object> config, List<Map<Stri
       public static Vector<Byte> mapToLabel(Map<String,Object> config, List<Map<String,Object>> list) {
             LabelCommand tsc = new LabelCommand();
 
+            int count = (int)(config.get("count")==null?1:config.get("count"));
             int width = (int)(config.get("width")==null?60:config.get("width")); // 单位：mm
             int height = (int)(config.get("height")==null?75:config.get("height")); // 单位：mm
             int gap = (int)(config.get("gap")==null?0:config.get("gap")); // 单位：mm
@@ -170,7 +171,7 @@ public static Vector<Byte> mapToLabel(Map<String,Object> config, List<Map<String
             }
 
             // 打印标签
-            tsc.addPrint(1, 1);
+            tsc.addPrint(1, count);
             // 打印标签后 蜂鸣器响
             tsc.addSound(2, 100);
             //开启钱箱

diff --git a/ios/Classes/BluetoothPrintPlugin.m b/ios/Classes/BluetoothPrintPlugin.m
@@ -136,7 +136,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
 -(NSData *)mapToTscCommand:(NSDictionary *) args {
     NSDictionary *config = [args objectForKey:@"config"];
     NSMutableArray *list = [args objectForKey:@"data"];
-
+
+    NSNumber *count = ![config objectForKey:@"count"]?@"1" : [config objectForKey:@"count"];
     NSNumber *width = ![config objectForKey:@"width"]?@"48" : [config objectForKey:@"width"];
     NSNumber *height = ![config objectForKey:@"height"]?@"80" : [config objectForKey:@"height"];
     NSNumber *gap = ![config objectForKey:@"gap"]?@"2" : [config objectForKey:@"gap"];
@@ -177,7 +178,7 @@ -(NSData *)mapToTscCommand:(NSDictionary *) args {
 
     }
 
-    [command addPrint:1 :1];
+    [command addPrint:1 :count];
     return [command getCommand];
 }
 

diff --git a/lib/bluetooth_print_model.dart b/lib/bluetooth_print_model.dart
@@ -56,9 +56,11 @@ class LineText {
 
   /// ['text'] double
   final int? weight;
-  final int? width;
   final int? height;
 
+  /// ['text','image'] double
+  final int? width;
+
   /// ['text'] absolute position from line begin
   final int? absolutePos;