From ea8b02bbc2d20dc3db5b045fac4e6ddff7f44b7c Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期日, 29 九月 2024 10:30:10 +0800
Subject: [PATCH] 优化NFC模块架构，将一些方法抽调到父类中。修复一些bug
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/print/ShangMiAidlUtil.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/utils/AidlUtil.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/print/ShangMiAidlUtil.java
similarity index 92%
rename from baselibrary/src/main/java/com/dayu/baselibrary/utils/AidlUtil.java
rename to baselibrary/src/main/java/com/dayu/baselibrary/tools/print/ShangMiAidlUtil.java
index 57ce8ea..4ff30e0 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/utils/AidlUtil.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/print/ShangMiAidlUtil.java
@@ -1,4 +1,4 @@
-package com.dayu.baselibrary.utils;
+package com.dayu.baselibrary.tools.print;
import android.content.ComponentName;
import android.content.Context;
@@ -14,6 +14,8 @@
import com.dayu.baselibrary.R;
import com.dayu.baselibrary.bean.TableItem;
+import com.dayu.baselibrary.utils.ESCUtil;
+import com.dayu.baselibrary.utils.PrinterCallback;
import java.util.ArrayList;
@@ -23,19 +25,21 @@
import woyou.aidlservice.jiuiv5.ICallback;
import woyou.aidlservice.jiuiv5.IWoyouService;
-
-public class AidlUtil {
+/**
+ * 鍟嗙背鎵撳嵃妯″潡鐩稿叧浠ｇ爜
+ */
+public class ShangMiAidlUtil {
private static final String SERVICE锛縋ACKAGE = "woyou.aidlservice.jiuiv5";
private static final String SERVICE锛緼CTION = "woyou.aidlservice.jiuiv5.IWoyouService";
private IWoyouService woyouService;
- private static AidlUtil mAidlUtil = new AidlUtil();
+ private static ShangMiAidlUtil mAidlUtil = new ShangMiAidlUtil();
private Context context;
- private AidlUtil() {
+ private ShangMiAidlUtil() {
}
- public static AidlUtil getInstance() {
+ public static ShangMiAidlUtil getInstance() {
return mAidlUtil;
}
@@ -220,7 +224,7 @@
/**
* 鎵撳嵃鏂囧瓧
*/
- public void printText(String content, float size, boolean isBold, boolean isUnderLine) {
+ public void printText(List<String> content, float size, boolean isBold, boolean isUnderLine) {
if (woyouService == null) {
Toast.makeText(context, R.string.toast_2, Toast.LENGTH_LONG).show();
return;
@@ -238,8 +242,10 @@
} else {
woyouService.sendRAWData(ESCUtil.underlineOff(), null);
}
-
- woyouService.printTextWithFont(content, null, size, null);
+ woyouService.setFontSize(size, null);
+ for (int i = 0; i < content.size(); i++) {
+ woyouService.printText(content.get(i) + "\n", null);
+ }
woyouService.lineWrap(3, null);
} catch (RemoteException e) {
e.printStackTrace();
@@ -248,7 +254,7 @@
}
/*
- *鎵撳嵃鍥剧墖
+ *鎵撳嵃鍥剧墖
*/
public void printBitmap(Bitmap bitmap) {
if (woyouService == null) {
@@ -313,7 +319,7 @@
}
/*
- * 绌烘墦涓夎锛�
+ * 绌烘墦涓夎锛�
*/
public void print3Line() {
if (woyouService == null) {
--
Gitblit v1.8.0