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 图标用于返还操作
---
generallibrary/src/main/res/layout/fragment_card.xml | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/generallibrary/src/main/res/layout/fragment_card.xml b/generallibrary/src/main/res/layout/fragment_card.xml
index 9323298..4796514 100644
--- a/generallibrary/src/main/res/layout/fragment_card.xml
+++ b/generallibrary/src/main/res/layout/fragment_card.xml
@@ -264,14 +264,14 @@
<ImageView
android:layout_width="55dp"
android:layout_height="55dp"
- android:src="@drawable/xiaoka" />
+ android:src="@drawable/ic_morny_back" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
- android:text="閿�鍗�"
+ android:text="杩旇繕"
android:textColor="@color/text_selecter_color"
android:textSize="14sp" />
</LinearLayout>
@@ -301,9 +301,9 @@
android:padding="12dp">
<ImageView
- android:layout_width="55dp"
+ android:layout_width="65dp"
android:layout_height="55dp"
- android:src="@drawable/bukou" />
+ android:src="@drawable/ic_supplement" />
<TextView
android:layout_width="wrap_content"
@@ -316,11 +316,48 @@
</LinearLayout>
</androidx.cardview.widget.CardView>
+ <androidx.cardview.widget.CardView
+ android:id="@+id/home_cancel_card"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="6dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="6dp"
+ android:clickable="true"
+ android:focusable="true"
+ android:foreground="?android:attr/selectableItemBackground"
+ app:cardCornerRadius="10dp"
+ app:cardElevation="3dp"
+ app:layout_constraintEnd_toStartOf="@+id/home_manage"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/home_reverse">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="vertical"
+ android:padding="12dp">
+
+ <ImageView
+ android:layout_width="55dp"
+ android:layout_height="55dp"
+ android:src="@drawable/xiaoka" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="6dp"
+ android:gravity="center"
+ android:text="閿�鍗�"
+ android:textColor="@color/text_selecter_color"
+ android:textSize="14sp" />
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/home_manage"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="16dp"
@@ -333,7 +370,7 @@
app:cardElevation="3dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
-
+ app:layout_constraintStart_toEndOf="@+id/home_cancel_card"
app:layout_constraintTop_toBottomOf="@+id/home_deduction"
app:layout_constraintVertical_bias="0.0">
--
Gitblit v1.8.0