From 55b196ea2e28a8d859c85326f2147a4f7b7196de Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期四, 10 四月 2025 10:58:32 +0800
Subject: [PATCH] feat(general): 新增开卡信息保存功能并优化界面布局- 新增 CardRegistrationBean 数据模型用于保存开卡信息 - 在数据库中添加 card_registration 表用于存储开卡记录 - 优化 NewCard2Activity 界面布局,调整样式和间距 - 添加协程支持,实现异步保存开卡信息到数据库 - 更新颜色配置,统一使用新加的 base_blue_bg 和 base_green_bg颜色

---
 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