From f5180b600511d1871635bd364beb5bdd15f6ae88 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期三, 26 三月 2025 18:05:07 +0800
Subject: [PATCH] feat(nfc): 优化 NFC写卡功能并添加新方法- 在 BaseNfcWriteHelper 中添加了新的 writeData 方法,增加了 isConnect 参数 - 优化了 NativeNfcWriteHelper 中的 writeData 实现,支持选择性连接 NFC - 更新了 NfcWriteAdapter,支持新的 writeData 方法- 修改了 NfcWreatHelper 中的 writeData 方法,使用新的接口 - 优化了 NfcWreatActivity 中的写卡逻辑

---
 henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
index be76c16..13418a8 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -10,9 +10,9 @@
 import android.view.View;
 import android.widget.Toast;
 
-import com.dayu.baselibrary.activity.BaseNfcActivity;
 import com.dayu.baselibrary.tools.BcdUtil;
-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.BaseCommon;
 import com.dayu.baselibrary.utils.CRC8;
 import com.dayu.baselibrary.utils.DateUtil;
@@ -48,8 +48,10 @@
 import com.dayu.henanlibrary.view.ProgressDialog;
 import com.tencent.bugly.crashreport.CrashReport;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.List;
 
 /**
  * Copyright (C), 2023,
@@ -365,8 +367,6 @@
     }
 
 
-
-
     /**
      * 鎵撳嵃鏈虹浉鍏充俊鎭�
      *
@@ -374,24 +374,21 @@
      */
     private void setPrinterData(RechargeBean rechargeBean) {
         try {
-            StringBuffer data = new StringBuffer();
+            List<String> data = new ArrayList<>();
             if (rechargeBean != null) {
-                data.append("*****************************" + "\n");
 
-                data.append("璁惧搴忓垪鍙凤細").append(rechargeBean.getSerial()).append("\n");
-                data.append("鐢ㄦ埛鍚嶏細").append(rechargeBean.getUserName()).append("\n");
-                //            data.append("鎴�  鍙凤細" + rechargeBean.getUserNum() + "\n");
-                data.append("鍏呭�奸噾棰濓細").append(rechargeBean.getMorny()).append("鍏�").append("\n");
-                data.append("鍗″唴浣欓锛�").append(rechargeBean.getBalance()).append("鍏�").append("\n");
-                data.append("鏃�  鏈燂細").append(DateUtil.dateToStamp(rechargeBean.getDate(), DateUtil.type2)).append("\n\n");
-                data.append("*****************************");
+                data.add("*****************************");
+                data.add("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial());
+                data.add("鐢ㄦ埛鍚嶏細" + rechargeBean.getUserName());
+                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);
+                ShangMiAidlUtil.getInstance().print3Line();
             } catch (Exception e) {
                 e.printStackTrace();
             }

--
Gitblit v1.8.0