From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮,跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity,优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity,支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作

---
 baselibrary/src/main/java/com/dayu/baselibrary/BaseApplication.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/BaseApplication.java b/baselibrary/src/main/java/com/dayu/baselibrary/BaseApplication.java
index fb0b940..fa8f297 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/BaseApplication.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/BaseApplication.java
@@ -1,9 +1,8 @@
 package com.dayu.baselibrary;
 
 import android.app.Application;
-import android.content.Context;
 
-import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.tools.print.PrintAdater;
 
 /**
  * author: zuo
@@ -23,10 +22,14 @@
     }
 
 
-    //鍒濆鍖栨墦鍗扮浉鍏虫湇鍔�
-    public void onCreat(Context context) {
-        AidlUtil.getInstance().connectPrinterService(context);
+
+    public void onCreat(Application context) {
+        application = context;
+
+        //鍒濆鍖栨墦鍗扮浉鍏虫湇鍔�
+        PrintAdater.getInstance().connectPrinterService(context);
     }
 
 
+
 }

--
Gitblit v1.8.0