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
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/PrintUtils.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/PrintUtils.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/PrintUtils.java
index 9d0d1b3..b21ded2 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/PrintUtils.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/PrintUtils.java
@@ -1,12 +1,14 @@
package com.dayu.qiheonlinelibrary.utils;
-import android.text.TextUtils;
-
-import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.tools.print.PrintAdater;
+import com.dayu.baselibrary.tools.print.ShangMiAidlUtil;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.qiheonlinelibrary.dbBean.RechargeBean;
import com.tencent.bugly.crashreport.CrashReport;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* Created by Android Studio.
@@ -24,27 +26,26 @@
*/
public static void printerData(RechargeBean rechargeBean) {
try {
- StringBuffer data = new StringBuffer();
+ List<String> data = new ArrayList<>();
if (rechargeBean != null) {
- data.append("*****************************" + "\n");
- data.append("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial() + "\n");
- data.append("濮� 鍚嶏細" + rechargeBean.getUserName() + "\n");
- data.append("鍗� 鍙凤細" + rechargeBean.getCardNumber() + "\n");
- data.append("鐢ㄦ埛缂栧彿锛�" + rechargeBean.getUserCode() + "\n");
- data.append("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�" + "\n");
+ data.add("*****************************");
+ data.add("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial());
+ data.add("濮� 鍚嶏細" + rechargeBean.getUserName());
+ data.add("鍗� 鍙凤細" + rechargeBean.getCardNumber());
+ data.add("鐢ㄦ埛缂栧彿锛�" + rechargeBean.getUserCode());
+ data.add("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�");
if (MornyUtil.changeY2F(rechargeBean.getDeductionMorny()) > 0) {
- data.append("琛ユ墸閲戦锛�" + rechargeBean.getDeductionMorny() + " 鍏�" + "\n");
+ data.add("琛ユ墸閲戦锛�" + rechargeBean.getDeductionMorny() + " 鍏�");
}
- data.append("鍏呭�煎悗鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�" + "\n");
- data.append("鍏呭�肩數閲忥細" + rechargeBean.getRechargeElectric() + " 搴�" + "\n");
- data.append("鍏呭�煎悗鍗″唴鐢甸噺锛�" + rechargeBean.getSurplusElectic() + " 搴�" + "\n");
- data.append("鏃� 鏈燂細" + DateUtil.dateToStamp(rechargeBean.getRechargeDate(), DateUtil.type2) + "\n\n");
- data.append("*****************************");
+ data.add("鍏呭�煎悗鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�");
+ data.add("鍏呭�肩數閲忥細" + rechargeBean.getRechargeElectric() + " 搴�");
+ data.add("鍏呭�煎悗鍗″唴鐢甸噺锛�" + rechargeBean.getSurplusElectic() + " 搴�");
+ data.add("鏃� 鏈燂細" + DateUtil.dateToStamp(rechargeBean.getRechargeDate(), DateUtil.type2));
+ data.add("*****************************");
}
float size = 26;
try {
- AidlUtil.getInstance().printText(data.toString(), size, true, false);
-// AidlUtil.getInstance().print3Line();
+ PrintAdater.getInstance().printText(data, size, true, false);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0