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/view/ConfirmDialog.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java b/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java
index 15a8f80..14ab7ba 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java
@@ -2,6 +2,7 @@
import android.app.Activity;
import android.app.Dialog;
+import android.content.Context;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
@@ -23,18 +24,18 @@
public class ConfirmDialog extends Dialog {
- Activity mContext;
+ Context mContext;
View.OnClickListener mListner;
String mData;
String mTitle;
- public ConfirmDialog(@NonNull Activity context) {
+ public ConfirmDialog(@NonNull Context context) {
super(context, com.dayu.baselibrary.R.style.ws_pay_showSelfDialog);
mContext = context;
initView();
}
- public ConfirmDialog(@NonNull Activity context, View.OnClickListener listner) {
+ public ConfirmDialog(@NonNull Context context, View.OnClickListener listner) {
super(context, com.dayu.baselibrary.R.style.ws_pay_showSelfDialog);
mContext = context;
mListner = listner;
@@ -42,7 +43,7 @@
}
- public ConfirmDialog(@NonNull Activity context, String data, View.OnClickListener listner) {
+ public ConfirmDialog(@NonNull Context context, String data, View.OnClickListener listner) {
super(context, com.dayu.baselibrary.R.style.ws_pay_showSelfDialog);
mContext = context;
mListner = listner;
@@ -50,7 +51,7 @@
initView();
}
- public ConfirmDialog(@NonNull Activity context, String title, String data, View.OnClickListener listner) {
+ public ConfirmDialog(@NonNull Context context, String title, String data, View.OnClickListener listner) {
super(context, com.dayu.baselibrary.R.style.ws_pay_showSelfDialog);
mContext = context;
mListner = listner;
@@ -80,7 +81,6 @@
if (mListner == null) {
ok.setOnClickListener((View v) -> {
ConfirmDialog.this.dismiss();
- mContext.finish();
});
} else {
ok.setOnClickListener(mListner);
--
Gitblit v1.8.0