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/NewCardListActivity.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardListActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardListActivity.java
index 6dd4a9f..53be978 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardListActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardListActivity.java
@@ -1,7 +1,6 @@
package com.dayu.henanlibrary.activity;
-
import static com.dayu.baselibrary.view.TitleBar.ClickType_RIGHT_TEXT;
import android.os.Bundle;
@@ -11,11 +10,11 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.adapter.NewCardAdapter;
-import com.dayu.henanlibrary.databinding.ActivityNewcardListBinding;
-import com.dayu.henanlibrary.dbBean.UserCardBean;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
+import com.dayu.henanlibrary.adapter.NewCardAdapter;
+import com.dayu.henanlibrary.databinding.ActivityNewcardListHnBinding;
+import com.dayu.henanlibrary.dbBean.UserCardBean;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
@@ -37,7 +36,7 @@
public class NewCardListActivity extends HNBaseActivity {
- ActivityNewcardListBinding newcardListBinding;
+ ActivityNewcardListHnBinding newcardListBinding;
List<UserCardBean> userCardBeanList = new ArrayList<>();
NewCardAdapter adapter;
private CustomDatePicker beginDatePicker;
@@ -54,7 +53,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- newcardListBinding = ActivityNewcardListBinding.inflate(LayoutInflater.from(this));
+ newcardListBinding = ActivityNewcardListHnBinding.inflate(LayoutInflater.from(this));
setContentView(newcardListBinding.getRoot());
setRightButton();
initDatePicker();
--
Gitblit v1.8.0