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 图标用于返还操作
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java
index c0a8983..143a13c 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java
@@ -6,9 +6,10 @@
import android.view.LayoutInflater;
import android.view.inputmethod.InputMethodManager;
+import com.dayu.baselibrary.activity.BaseActivity;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.databinding.ActivityAdminSetupBinding;
import com.dayu.henanlibrary.HeNanApplication;
+import com.dayu.henanlibrary.databinding.ActivityAdminSetupHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.dbBean.IpBean;
import com.example.pickerviewlibrary.picker.TeaPickerView;
@@ -22,7 +23,7 @@
*/
public class AdminSetupActivity extends HNBaseActivity {
- ActivityAdminSetupBinding adminBinding;
+ ActivityAdminSetupHnBinding adminBinding;
public static AdminSetupActivity adminSetupActivity;
AdminDataBean adminData = new AdminDataBean();
TeaPickerView pickerView;
@@ -31,7 +32,7 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- adminBinding = ActivityAdminSetupBinding.inflate(LayoutInflater.from(this));
+ adminBinding = ActivityAdminSetupHnBinding.inflate(LayoutInflater.from(this));
setContentView(adminBinding.getRoot());
adminSetupActivity = this;
setData();
--
Gitblit v1.8.0