Merge remote-tracking branch 'origin/master'

android/app/src/main/java/io/flutter/plugins/BluetoothPlugin.java

@@ -33,6 +33,7 @@ import java.security.Permission;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.ThreadFactory;
@@ -170,10 +171,17 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
                 Log.d("ble", "startBluetoothPrint :" + methodCall.arguments);
                 startBluetoothPrintBitMap(methodCall, result);
                 break;
+            case "startBluetoothPrintText":
+                Log.d("ble", "startBluetoothPrintText :" + methodCall.arguments);
+                startBluetoothPrintText(methodCall, result);
+                break;
             case "startBluetoothPrintBarCode":
                 Log.d("ble", "startBluetoothPrintBarCode :" + methodCall.arguments);
                 startBluetoothPrintBarCode(methodCall, result);
                 break;
+            case "startBluetoothPrintBitMapAndText":
+                Log.d("ble", "PrintBitMapAndText :" + methodCall.arguments);
+                printBitMapAndText(methodCall, result);
 
 
             case "autoLogin":
@@ -333,6 +341,41 @@ public class BluetoothPlugin implements FlutterPlugin, MethodChannel.MethodCallH
         }
     }
 
+    void startBluetoothPrintText(@NonNull MethodCall methodCall, @NonNull MethodChannel.Result result) {
+
+        ArrayList<String> textList = (ArrayList<String>) methodCall.arguments;
+
+        BluetoothDevice bluetoothDevice = mBluetoothAdapter.getRemoteDevice(itemPosition.getDeviceHardwareAddress());
+        if (ActivityCompat.checkSelfPermission(_applicationContext, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+            return;
+        }
+        BlueDeviceInfo blueDeviceInfo = new BlueDeviceInfo(bluetoothDevice.getName(), bluetoothDevice.getAddress(), itemPosition.getConnectState());
+        if(blueDeviceInfo.getDeviceName().contains("BTP")) {
+            BTPPrintUtil.printText(textList, result);
+        } else {
+            PrintUtil.printText(textList, result);
+        }
+    }
+
+    void printBitMapAndText(@NonNull MethodCall methodCall, @NonNull MethodChannel.Result result) {
+
+        HashMap map = (HashMap)methodCall.arguments;
+        byte[] imageByte = (byte[]) map.get("bytes");
+        ArrayList<String> textList = (ArrayList<String>) map.get("textList");
+
+        Bitmap bitmap = Bytes2Bimap(imageByte);
+        BluetoothDevice bluetoothDevice = mBluetoothAdapter.getRemoteDevice(itemPosition.getDeviceHardwareAddress());
+        if (ActivityCompat.checkSelfPermission(_applicationContext, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+            return;
+        }
+        BlueDeviceInfo blueDeviceInfo = new BlueDeviceInfo(bluetoothDevice.getName(), bluetoothDevice.getAddress(), itemPosition.getConnectState());
+        if(blueDeviceInfo.getDeviceName().contains("BTP")) {
+            BTPPrintUtil.PrintBitMapAndText(bitmap,  blueDeviceInfo.getDeviceName(), textList, result);
+        }
+
+    }
+
+
     void startBluetoothPrintBarCode(@NonNull MethodCall methodCall, @NonNull MethodChannel.Result result) {
 
         byte[] imageByte = (byte[]) methodCall.arguments;

android/app/src/main/java/io/flutter/plugins/utils/BTPPrintUtil.java

@@ -10,6 +10,8 @@ import com.snbc.sdk.LabelPrinter;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
 
 import io.flutter.plugin.common.MethodChannel;
 
@@ -73,13 +75,130 @@ public class BTPPrintUtil {
         result.success(code == 0 ? true : false);
     }
 
-    public  static void printBarCodeWithText(String barCode, String text, @NonNull MethodChannel.Result result) {
+    public  static void printText(ArrayList<String> textList,@NonNull MethodChannel.Result result) {
+
+        int width = 560;
+        int height = 640;
+        getInstance().SetLabelSize(width,height);
+
+        int marginX = 2;
+        int marginY = 40;
+        //矩形框类型
+        int rectangleWidth = width - marginX * 2;
+        int rectangleHeight = height - marginY * 2;
+        int lineWidth = 1;
+
+        int lineHeight = rectangleHeight / 6;
+
+        int titleWidth = rectangleWidth / 2;
+
+        float fontSize = 3;
+        // 设置初始偏移量
+        int offsetY = 0;
+        int offsetX = 0;
+        // 计算绘制线条的 y 坐标
+        int secondLineY = marginY + lineHeight * 2 - lineWidth + offsetY;
+        int thirdLineY = marginY + lineHeight * 3 - lineWidth + offsetY;
+        int fourthLineY = marginY + lineHeight * 4 - lineWidth + offsetY;
+        int fiveLineY = marginY + lineHeight * 5 - lineWidth + offsetY;
+
+        int textAlignHorizontal = 0; // 左对齐
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, marginY + offsetY, "3", textList.get(0), 0, 7, 0, 0);
+        labelPrinter.PrintText(marginX * 2 + titleWidth + offsetX, marginY + offsetY, "3", textList.get(1), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, marginY + lineHeight - lineWidth + offsetY, "3", textList.get(2), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, secondLineY, "3", textList.get(3), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, thirdLineY, "3", textList.get(4), 0, 7, 0, 0);
+        labelPrinter.PrintText(marginX * 2 + titleWidth + offsetX, thirdLineY, "3", textList.get(5), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, fourthLineY, "3", textList.get(6), 0, 7, 0, 0);
+        labelPrinter.PrintText(marginX * 2 + titleWidth + offsetX, fourthLineY, "3", textList.get(7), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, fiveLineY, "3", textList.get(8), 0, 7, 0, 0);
+        labelPrinter.PrintText(marginX * 2 + titleWidth + offsetX, fiveLineY, "3", textList.get(9), 0, 7, 0, 0);
+
 
-        getInstance().SetLabelSize(560,640);
-        labelPrinter.PrintBarcodeQR(80, 20,  0, "SHXM2024007404", 'H', 18, 2);
-        labelPrinter.PrintText(100, 500, "8", "SHXM2024007404", 0, 7, 3, 0);
         int code = getInstance().PrintLabel(1,1);
         result.success(code == 0 ? true : false);
     }
 
+    // BTP打印机同时打印图标和标签只能调这个，依次printBitMap再printText会导致偶发printText不走。
+    public  static  void PrintBitMapAndText(Bitmap bitmap, String deviceName, ArrayList<String> textList,@NonNull MethodChannel.Result result) {
+        int x = 0;
+        if(deviceName.contains("BTP-UP321")) {
+            x = 0;
+        } else if(deviceName.contains("BTP-P398PLUS")) {
+            x = 40;
+        }
+        int bytes = bitmap.getByteCount();
+        ByteBuffer buf = ByteBuffer.allocate(bytes);
+        bitmap.copyPixelsToBuffer(buf);
+        ByteArrayOutputStream LionData=new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, LionData);
+
+        getInstance().SetLabelSize(560,640*2);
+        int code = getInstance().PrintImageData(x, 0, LionData.toByteArray());
+
+
+        int width = 560;
+        int height = 640;
+
+        int marginX = 2;
+        int marginY = 80;
+        //矩形框类型
+        int rectangleWidth = width - marginX * 2;
+        int rectangleHeight = height - marginY * 2;
+        int lineWidth = 1;
+
+        int lineHeight = rectangleHeight / 6;
+
+        int titleWidth = rectangleWidth / 2;
+
+        float fontSize = 3;
+        // 设置初始偏移量
+        int offsetY = 680;
+        int offsetX = 0;
+        // 计算绘制线条的 y 坐标
+        int secondLineY = marginY + lineHeight * 2 - lineWidth + offsetY;
+        int thirdLineY = marginY + lineHeight * 3 - lineWidth + offsetY;
+        int fourthLineY = marginY + lineHeight * 4 - lineWidth + offsetY;
+        int fiveLineY = marginY + lineHeight * 5 - lineWidth + offsetY;
+
+        int textAlignHorizontal = 0; // 左对齐
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, marginY + offsetY, "3", textList.get(0), 0, 7, 0, 0);
+        labelPrinter.PrintText(marginX * 2 + titleWidth + offsetX, marginY + offsetY, "3", textList.get(1), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, marginY + lineHeight - lineWidth + offsetY, "3", textList.get(2), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, secondLineY, "3", textList.get(3), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, thirdLineY, "3", textList.get(4), 0, 7, 0, 0);
+        labelPrinter.PrintText(marginX * 2 + titleWidth + offsetX, thirdLineY, "3", textList.get(5), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, fourthLineY, "3", textList.get(6), 0, 7, 0, 0);
+        labelPrinter.PrintText(marginX * 2 + titleWidth + offsetX, fourthLineY, "3", textList.get(7), 0, 7, 0, 0);
+
+
+        labelPrinter.PrintText(marginX * 2 + offsetX, fiveLineY, "3", textList.get(8), 0, 7, 0, 0);
+        labelPrinter.PrintText(marginX * 2 + titleWidth + offsetX, fiveLineY, "3", textList.get(9), 0, 7, 0, 0);
+
+
+
+
+        getInstance().PrintLabel(1,1);
+        result.success(code == 0 ? true : false);
+    }
 }

android/app/src/main/java/io/flutter/plugins/utils/PrintUtil.java

@@ -297,4 +297,196 @@ public class PrintUtil {
     }
 
 
+    public static void printText(ArrayList<String> textList, @NonNull MethodChannel.Result result) {
+        // 检查是否连接了打印机
+        if (PrintUtil.isConnection() != 0) {
+            result.success(false);
+            return;
+        }
+
+        // 重置错误和取消打印状态
+        //重置错误状态变量
+        final boolean[] isError = {false};
+        //重置取消打印状态变量
+        final boolean[] isCancel = {false};
+        // 初始化打印数据
+        ArrayList<String> jsonList = new ArrayList<>();
+        ArrayList<String> infoList = new ArrayList<>();
+
+        // 在每次打印任务前初始化生成的打印数据页数
+        int generatedPrintDataPageCount = 0;
+        // 设置打印的总页数和份数
+        int pageCount = 1;
+        int quantity = 1;
+        int totalQuantity = pageCount * quantity;
+        //setTotalQuantityOfPrints已废弃，使用方法含义更明确的setTotalPrintQuantity
+        PrintUtil.getInstance().setTotalPrintQuantity(totalQuantity);
+        // 打印参数设置
+        /*
+         * 参数1：打印浓度 ，参数2:纸张类型 参数3:打印模式
+         * 打印浓度 B50/B50W/T6/T7/T8 建议设置6或8，Z401/B32建议设置8，B3S/B21/B203/B1建议设置3
+         */
+        PrintUtil.getInstance().startPrintJob(3, 3, 1, new PrintCallback() {
+            @Override
+            public void onProgress(int pageIndex, int quantityIndex, HashMap<String, Object> hashMap) {
+                // 更新打印进度
+                String progressMessage = "打印进度:已打印到第" + pageIndex + "页,第" + quantityIndex + "份";
+                Log.d("ble", "测试:" + progressMessage);
+
+                // 处理打印完成情况
+                if (pageIndex == pageCount && quantityIndex == quantity) {
+                    Log.d("ble", "测试:onProgress: 结束打印");
+                    //endJob，使用方法含义更明确的endPrintJob
+                    if (PrintUtil.getInstance().endPrintJob()) {
+                        Log.d("ble", "结束打印成功");
+                    } else {
+                        Log.d("ble", "结束打印失败");
+                    }
+                    result.success(true);
+                }
+            }
+
+
+            @Override
+            public void onError(int i) {
+
+            }
+
+
+            @Override
+            public void onError(int errorCode, int printState) {
+                Log.d("ble", "测试:onError");
+                isError[0] = true;
+                result.success(false);
+            }
+
+            @Override
+            public void onCancelJob(boolean isSuccess) {
+                //取消打印成功回调
+                isCancel[0] = true;
+            }
+
+            /**
+             * SDK缓存空闲回调，可以在此处传入打印数据
+             *
+             * @param pageIndex 当前回调函数处理下一页的打印索引
+             * @param bufferSize 缓存空间的大小
+             */
+            @Override
+            public void onBufferFree(int pageIndex, int bufferSize) {
+                // 如果出现错误、已取消打印，或 pageIndex 超过总页数，则返回
+                if (isError[0] || isCancel[0] || pageIndex > pageCount) {
+                    return;
+                }
+
+                Log.d(TAG, "测试-空闲数据回调-数据生成判断-总页数 " + pageCount + ",已生成页数:" + generatedPrintDataPageCount + ",空闲回调数据长度：" + bufferSize);
+                // 生成打印数据
+                generatePrintDataIfNeeded(textList, bufferSize, generatedPrintDataPageCount, pageCount, jsonList, infoList, quantity);
+            }
+        });
+    }
+
+
+    /**
+     * 根据需要生成打印数据，确保不超过总页数限制。
+     *
+     * @param bufferSize 当前缓存空间的大小。
+     */
+    private static void generatePrintDataIfNeeded(ArrayList<String> textList,int bufferSize, int generatedPrintDataPageCount, int pageCount, ArrayList<String> jsonList, ArrayList<String> infoList, int quantity) {
+        // 如果已生成的打印数据页数小于总页数，则继续生成
+        if (generatedPrintDataPageCount < pageCount) {
+            // 计算本次要生成的数据长度，以免超过总页数
+            int commitDataLength = Math.min((pageCount - generatedPrintDataPageCount), bufferSize);
+            // 生成数据
+            generateMultiPagePrintData(textList,generatedPrintDataPageCount, generatedPrintDataPageCount + commitDataLength, jsonList, infoList, quantity);
+            // 提交打印数据
+            PrintUtil.getInstance().commitData(jsonList.subList(generatedPrintDataPageCount, generatedPrintDataPageCount + commitDataLength), infoList.subList(generatedPrintDataPageCount, generatedPrintDataPageCount + commitDataLength));
+            // 更新已生成的打印数据页数
+            generatedPrintDataPageCount += commitDataLength;
+        }
+    }
+
+    /**
+     * 生成多页的打印数据。
+     *
+     * @param index      起始索引，生成数据的起始页。
+     * @param cycleIndex 结束索引，生成数据的结束页。
+     */
+    private static void generateMultiPagePrintData(ArrayList<String> textList, int index, int cycleIndex, ArrayList<String> jsonList, ArrayList<String> infoList, int quantity) {
+
+
+        while (index < cycleIndex) {
+
+            // 设置打印参数
+            float width = 70;
+            float height = 72.5F;
+            int orientation = 0;
+            float marginX = 2.0F;
+            float marginY = 10.0F;
+            //矩形框类型
+            float rectangleWidth = width - marginX * 2;
+            float rectangleHeight = height - marginY * 2;
+            float lineWidth = 0.5F;
+            //1.圆 2.椭圆 3.矩形 4.圆角矩形
+            int graphType = 3;
+            float lineHeight = rectangleHeight / 6.0F;
+//            float titleWidth = rectangleWidth * 2 / 5.0F;
+//            float contentWidth = rectangleWidth * 3 / 5.0F;
+
+            float titleWidth = rectangleWidth / 2.0F;
+            float contentWidth = rectangleWidth / 2.0F;
+
+            float fontSize = 3.0F;
+            // 设置初始偏移量
+            float offsetY = 0F;
+            float offsetX = 0F;
+            // 计算绘制线条的 y 坐标
+            float secondLineY = marginY + lineHeight * 2 - lineWidth + offsetY;
+            float thirdLineY = marginY + lineHeight * 3 - lineWidth + offsetY;
+            float fourthLineY = marginY + lineHeight * 4 - lineWidth + offsetY;
+            float fiveLineY = marginY + lineHeight * 5 - lineWidth + offsetY;
+            List<String> fonts = new ArrayList<>();
+            fonts.add("ZT008.ttf");
+            // 设置画布大小
+            PrintUtil.getInstance().drawEmptyLabel(width, height, orientation, fonts);
+
+            int textAlignHorizontal = 0; // 左对齐
+            // 绘制小标题
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + offsetX, marginY + offsetY, titleWidth - marginX * 3, lineHeight, textList.get(0), "宋体", fontSize, 0, textAlignHorizontal, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + titleWidth + offsetX, marginY + offsetY, contentWidth - marginX * 3, lineHeight, textList.get(1), "宋体", fontSize, 0, 0, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+
+
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + offsetX, marginY + lineHeight - lineWidth + offsetY, rectangleWidth - marginX * 3, lineHeight, textList.get(2), "宋体", fontSize, 0, textAlignHorizontal, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+
+
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + offsetX, secondLineY, rectangleWidth - marginX * 3, lineHeight, textList.get(3), "宋体", fontSize, 0, textAlignHorizontal, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+
+
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + offsetX, thirdLineY, titleWidth - marginX * 3, lineHeight, textList.get(4), "宋体", fontSize, 0, textAlignHorizontal, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + titleWidth + offsetX, thirdLineY, contentWidth - marginX * 3, lineHeight, textList.get(5), "宋体", fontSize, 0, 0, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+
+
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + offsetX, fourthLineY, titleWidth - marginX * 3, lineHeight, textList.get(6), "宋体", fontSize, 0, textAlignHorizontal, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + titleWidth + offsetX, fourthLineY, contentWidth - marginX * 3, lineHeight, textList.get(7), "宋体", fontSize, 0, 0, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+
+
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + offsetX, fiveLineY, titleWidth - marginX * 3, lineHeight, textList.get(8), "宋体", fontSize, 0, textAlignHorizontal, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+            PrintUtil.getInstance().drawLabelText(marginX * 2.5f + titleWidth + offsetX, fiveLineY, contentWidth - marginX * 3, lineHeight, textList.get(9), "宋体", fontSize, 0, 0, 1, 6, 0, 1, new boolean[]{false, false, false, false});
+
+            //生成打印数据
+            byte[] jsonByte = PrintUtil.getInstance().generateLabelJson();
+
+            //转换为jsonStr
+            String jsonStr = new String(jsonByte);
+
+
+            jsonList.add(jsonStr);
+            //除B32/Z401/T8的printMultiple为11.81，其他的为8
+            String jsonInfo = "{  " + "\"printerImageProcessingInfo\": " + "{    " + "\"orientation\":" + orientation + "," + "   \"margin\": [      0,      0,      0,      0    ], " + "   \"printQuantity\": " + quantity + ",  " + "  \"horizontalOffset\": 0,  " + "  \"verticalOffset\": 0,  " + "  \"width\":" + width + "," + "   \"height\":" + height + "," + "\"printMultiple\":" + 8 + "," + "  \"epc\": \"\"  }}";
+            infoList.add(jsonInfo);
+
+            index++;
+        }
+    }
+
 }

lib/page/print/print_page.dart

@@ -20,9 +20,10 @@ import 'dart:ui' as ui;
 
 class PrintPageArgs {
   /// 二维码数据
-  Uint8List? bytes;
+  Uint8List bytes;
+  List<String> textList;
 
-  PrintPageArgs({this.bytes});
+  PrintPageArgs({required this.bytes, required this.textList});
 
   @override
   String toString() {
@@ -98,7 +99,12 @@ class _PrintPageState extends BaseLifecycleState<PrintPage> {
 
 
     MyNavigator.showLoading(msg: '打印中...');
-    await PrintService.startBluetoothPrintBitMap(smallUint8List!);
+    if(PrintService.connectedDeviceList.last.deviceName.contains("BTP")) {
+      await PrintService.startBluetoothPrintBitMapAndText(smallUint8List!, widget.args.textList);
+    } else {
+      await PrintService.startBluetoothPrintBitMap(smallUint8List!);
+      await PrintService.startBluetoothPrintText(widget.args.textList);
+    }
     MyNavigator.dismiss();
     MyNavigator.showToast('打印成功');
   }

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -7,6 +7,8 @@ import 'package:card_swiper/card_swiper.dart';
 import 'package:flutter/material.dart';
 import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:lszlgl/main.dart';
+import 'package:lszlgl/page/print/print_page.dart';
+import 'package:lszlgl/service/print_service.dart';
 import 'package:lszlgl/utils/input_formatter.dart';
 import 'package:lszlgl/utils/location_utils.dart';
 import 'package:lszlgl/widget/button.dart';
@@ -15,6 +17,7 @@ import '../../../config/colors.dart';
 import '../../../model/rsp/dict_rsp.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../network/my_api.dart';
+import '../../../service/dict_service.dart';
 import '../../../service/user_service.dart';
 import '../../../utils/file_utils.dart';
 import '../../../widget/card_item.dart';
@@ -359,7 +362,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
             ),
             Row(
               children: [
-                const Expanded(child: MyButton('打印')),
+                Expanded(child: MyButton('打印', onTap: () => printPic(picInfo.name))),
                 const SizedBox(width: 16),
                 Expanded(child: MyButton('保存图片', onTap: () => savePic(picInfo.name))),
               ],
@@ -370,6 +373,14 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     );
   }
 
+  Future<void> printPic(String? name) async {
+
+    Uint8List? bytes = await FileUtils.getBitmapFromContext(ewmKey.currentContext);
+    List<String> textList = PrintService.getPrintTextListWithSampleTaskItem(data);
+    var args = PrintPageArgs(bytes: bytes!, textList: textList);
+    await MyRouter.startPrint(args);
+  }
+
   void savePic(String? name) async {
     MyNavigator.showLoading(msg: '保存中...');
     Uint8List? bytes = await FileUtils.getBitmapFromContext(ewmKey.currentContext);

lib/page/sample_task/reap_sample_detail/reap_sample_org_detail_page.dart

@@ -29,6 +29,8 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
   String? zldz;
   String? aqjg;
   String? aqdz;
+  String? pzjg;
+  String? pzdz;
 
   /// 校验数据
   bool verifyData() {
@@ -51,6 +53,9 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
         } else if (item.sjbj == 3) {
           aqjg = item.dwmc;
           aqdz = item.address;
+        } else if (item.sjbj == 2) {
+          pzjg = item.dwmc;
+          pzdz = item.address;
         }
       }
     }
@@ -66,13 +71,13 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
     return Column(
       children: [
         CardItemWidget(
-          '质量检验机构',
+          '质量指标检验机构',
           rightText: zljg,
           bottomLine: true,
         ),
         CardItemWidget(
-          '机构地址',
-          rightText: zldz,
+          '品质指标检验机构',
+          rightText: pzjg,
           bottomLine: true,
         ),
         CardItemWidget(
@@ -80,10 +85,10 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
           rightText: aqjg,
           bottomLine: true,
         ),
-        CardItemWidget(
-          '机构地址',
-          rightText: aqdz,
-        ),
+        // CardItemWidget(
+        //   '机构地址',
+        //   rightText: aqdz,
+        // ),
       ],
     );
   }

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -19,6 +19,7 @@ import 'package:lszlgl/page/signature/signature_page.dart';
 import '../../../base/base_vm.dart';
 import '../../../main.dart';
 import '../../../network/my_api.dart';
+import '../../../service/print_service.dart';
 import '../../../utils/file_utils.dart';
 import '../../../widget/button.dart';
 import '../../../widget/page_widget.dart';
@@ -223,10 +224,11 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
 
   Future<void> printPic(String? name) async {
 
+    SampleTaskItem? req = pageStatus.value.data;
     Uint8List? bytes = await FileUtils.getBitmapFromContext(ewmKey.currentContext);
-
-    var args = PrintPageArgs(bytes: bytes);
-    await MyRouter.startPrint(args: args);
+    List<String> textList = PrintService.getPrintTextListWithSampleTaskItem(req);
+    var args = PrintPageArgs(bytes: bytes!, textList: textList);
+    await MyRouter.startPrint(args);
   }
 
   void savePic(String? name) async {

lib/plugin/bluetooth_plugin.dart

@@ -91,6 +91,25 @@ class BluetoothPlugin {
   }
 
   //开始打印
+  Future<bool> startBluetoothPrintText(List<String> textList) async {
+
+    if (Platform.isIOS) {
+      return false;
+    }
+    return _channel.invokeMethod('startBluetoothPrintText', textList).then<bool>((d) => d);
+  }
+
+  //开始打印
+  Future<bool> startBluetoothPrintBitMapAndText(Uint8List bytes,List<String> textList) async {
+
+    if (Platform.isIOS) {
+      return false;
+    }
+    return _channel.invokeMethod('startBluetoothPrintBitMapAndText', {"bytes": bytes, "textList": textList}).then<bool>((d) => d);
+  }
+
+
+  //开始打印
   Future<bool> startBluetoothPrintBarCodeWithText(String barCode, String text) async {
 
     if (Platform.isIOS) {

lib/router/my_router.dart

@@ -117,8 +117,8 @@ class MyRouter {
   }
 
   /// 打印任务
-  static Future<dynamic> startPrint({PrintPageArgs? args}) {
-    return MyNavigator.push(rPrintPage, args: args ?? PrintPageArgs());
+  static Future<dynamic> startPrint(PrintPageArgs args) {
+    return MyNavigator.push(rPrintPage, args: args);
   }
 
   /// 打印任务

lib/service/print_service.dart

@@ -6,11 +6,14 @@ import 'package:device_info_plus/device_info_plus.dart';
 import 'package:lszlgl/utils/permission_utils.dart';
 import 'package:permission_handler/permission_handler.dart';
 
+import '../model/rsp/sample_task_rsp.dart';
 import '../plugin/bluetooth_plugin.dart';
 import '../router/my_navigator.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import 'dict_service.dart';
+
 class PrintService {
   PrintService._();
 
@@ -136,6 +139,16 @@ class PrintService {
     }
   }
 
+  // 打印打印图片和文字只给BTP设备使用
+  static Future<bool> startBluetoothPrintBitMapAndText(Uint8List bytes,List<String> textList) async {
+
+    if(await canExecAction()) {
+      return await BluetoothPlugin.instance.startBluetoothPrintBitMapAndText(bytes, textList);
+    } else {
+      return false;
+    }
+  }
+
   //开始打印图片
   static Future<bool> startBluetoothPrintBitMap(Uint8List bytes) async {
 
@@ -146,6 +159,18 @@ class PrintService {
     }
   }
 
+  //开始打印文字
+  static Future<bool> startBluetoothPrintText(List<String> textList) async {
+
+    //
+
+    if(await canExecAction()) {
+      return await BluetoothPlugin.instance.startBluetoothPrintText(textList);
+    } else {
+      return false;
+    }
+  }
+
   //开始打印二维码和文本
   static Future<bool> startBluetoothPrintBarCodeWithText(String barCode, String text) async {
 
@@ -156,6 +181,19 @@ class PrintService {
     }
   }
 
+  static List<String> getPrintTextListWithSampleTaskItem(SampleTaskItem? data) {
+
+    List<String> textList = [];
+    textList.addAll(["采样品种:${data?.cypzName ?? ''}","种植品种:${data?.jtpzmc ?? ''}"]);
+    textList.addAll(["${data?.shengXzqhName ?? ''}${data?.shiXzqhName ?? ''}${data?.quXzqhName ?? ''}${data?.xiangXzqhName ?? ''}${data?.cunXzqhName ?? ''}"]);
+    textList.addAll(["扦样人员:${data?.dgryName ?? ''}"]);
+    textList.addAll(["收获时间:${data?.shsj ?? ''}","扦样时间:${data?.qysj ?? ''}"]);
+    textList.addAll(["扦样数量:${data?.qysl ?? ''}kg","样品层级:${DictService.getLabel(DictType.ypdj, value: data?.ypdj)}"]);
+    textList.addAll(["种植面积:${data?.zzmj ?? ''}亩","代表数量:${(data?.qydbsl ?? '').toString()}公斤"]);
+
+    return textList;
+  }
+