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

---
 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
index 4306e84..bdb654f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
@@ -9,7 +9,7 @@
 import android.view.View;
 
 import com.dayu.baselibrary.tools.HexUtil;
-import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.tools.print.PrintAdater;
 import com.dayu.baselibrary.utils.BaseCommon;
 import com.dayu.baselibrary.utils.DateUtil;
 import com.dayu.baselibrary.utils.MornyUtil;
@@ -39,7 +39,9 @@
 import com.dayu.qihealonelibrary.utils.CardCommon;
 import com.tencent.bugly.crashreport.CrashReport;
 
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.List;
 
 /**
  * Copyright (C), 2023,
@@ -47,7 +49,7 @@
  * Date: 2023-11-08 21:19
  * Description: nfc鍐欏崱鐣岄潰
  */
-public class NFCWreatActivityQHAlone  extends QHAloneBaseNfcActivity {
+public class NFCWreatActivityQHAlone extends QHAloneBaseNfcActivity {
 
     RegisteredCard registeredCard;
     CleanUserCard cleanUserCard;
@@ -364,22 +366,20 @@
      */
     private void setPrinterData(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.getMorny() + " 鍏�" + "\n");
-                data.append("鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�" + "\n");
-                data.append("鏃�  鏈燂細" + DateUtil.dateToStamp(rechargeBean.getDate(), DateUtil.type2) + "\n\n");
-                data.append("*****************************");
+                data.add("*****************************");
+                data.add("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial());
+                data.add("鐢ㄦ埛鍚嶏細" + rechargeBean.getUserName());
+                data.add("鍗�  鍙凤細" + rechargeBean.getCardNumber());
+                data.add("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�");
+                data.add("鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�");
+                data.add("鏃�  鏈燂細" + DateUtil.dateToStamp(rechargeBean.getDate(), 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