diff --git a/module_base/build.gradle b/module_base/build.gradle index d598af2..7f3c568 100644 --- a/module_base/build.gradle +++ b/module_base/build.gradle @@ -152,11 +152,10 @@ dependencies { api 'me.jessyan:autosize:1.2.+' // 佳博打印SDK -// api('com.gainscha:sdk2:2.0.3@aar') { -// exclude group: 'com.jcraft' -// } -// api(name: 'sdk2-2.1.6-20250901.051214-1', ext: 'aar') { api(name: 'sdk2-2.0.4', ext: 'aar') { exclude group: 'com.jcraft' } + api(name: 'fimage-1.0.0', ext: 'aar') { + exclude group: 'com.jcraft' + } } \ No newline at end of file diff --git a/module_base/libs/fimage-1.0.0.aar b/module_base/libs/fimage-1.0.0.aar new file mode 100644 index 0000000..fc7bfbf Binary files /dev/null and b/module_base/libs/fimage-1.0.0.aar differ diff --git a/module_base/src/main/java/com/lukouguoji/module_base/util/PrinterUtils.kt b/module_base/src/main/java/com/lukouguoji/module_base/util/PrinterUtils.kt index 191abe1..3f34557 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/util/PrinterUtils.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/util/PrinterUtils.kt @@ -1,6 +1,7 @@ package com.lukouguoji.module_base.util import android.Manifest +import android.graphics.Typeface import com.gainscha.sdk2.ConnectType import com.gainscha.sdk2.ConnectionListener import com.gainscha.sdk2.Printer @@ -360,8 +361,11 @@ object PrinterUtils { addGap(3) addCls() // 标题居中(8个字 * 120像素/字 = 960像素宽,字体size=5) - val titleX = gridStartX + (gridWidth - 960) / 2 - addText(titleX, 80, Tspl.FONT_TSS24, 0, 5, 5, "合肥新桥国际机场") +// val titleX = gridStartX + (gridWidth - 960) / 2 +// addText(titleX, 80, Tspl.FONT_TSS24, 0, 5, 5, "合肥新桥国际机场") + + addTextByBitmap(80, 80, 0, 130, "合肥新桥国际机场", Typeface.DEFAULT) + // 表格横线 for (i in 0 until 5) { addBar(gridStartX, gridStartY + (i * gridItemHeight), gridWidth, 2) @@ -405,8 +409,9 @@ object PrinterUtils { addGap(3) addCls() // 标题居中(8个字 * 120像素/字 = 960像素宽,字体size=5) - val titleX = gridStartX + (gridWidth - 960) / 2 - addText(titleX, 80, Tspl.FONT_TSS24, 0, 5, 5, "合肥新桥国际机场") +// val titleX = gridStartX + (gridWidth - 960) / 2 +// addText(titleX, 80, Tspl.FONT_TSS24, 0, 5, 5, "合肥新桥国际机场") + addTextByBitmap(80, 80, 0, 130, "合肥新桥国际机场", Typeface.DEFAULT) // 表格横线 for (i in 0 until 9) { addBar(gridStartX, gridStartY + (i * gridItemHeight), gridWidth, 2) @@ -452,7 +457,10 @@ object PrinterUtils { */ private fun printMergedGrid(rows: ArrayList) { val gridStartX = 30 - val gridStartY = 200 + val titleTopMargin = 50 // 标题顶部间距 + val titleFontSize = 130 // 标题字体大小 + val titleTableGap = 40 // 标题与表格之间的间距 + val gridStartY = titleTopMargin + titleFontSize + titleTableGap // 计算表格起始Y坐标 val columnWidth = 570 val rowHeight = 180 // 减小行高,适应较小字体 val gridWidth = columnWidth * 2 @@ -462,8 +470,9 @@ object PrinterUtils { addGap(3) addCls() // 标题居中(8个字 * 120像素/字 = 960像素宽,字体size=5) - val titleX = gridStartX + (gridWidth - 960) / 2 - addText(titleX, 60, Tspl.FONT_TSS24, 0, 5, 5, "合肥新桥国际机场") +// val titleX = gridStartX + (gridWidth - 960) / 2 +// addText(titleX, 60, Tspl.FONT_TSS24, 0, 5, 5, "合肥新桥国际机场") + addTextByBitmap(80, titleTopMargin, 0, titleFontSize, "合肥新桥国际机场", Typeface.DEFAULT) // 绘制表格横线 for (i in 0..rows.size) {