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_recharge.xml | 404 +++++++--------------------------------------------------
1 files changed, 52 insertions(+), 352 deletions(-)
diff --git a/generallibrary/src/main/res/layout/fragment_recharge.xml b/generallibrary/src/main/res/layout/fragment_recharge.xml
index e9971e8..8d8c8fe 100644
--- a/generallibrary/src/main/res/layout/fragment_recharge.xml
+++ b/generallibrary/src/main/res/layout/fragment_recharge.xml
@@ -3,389 +3,89 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#F5F5F5">
-
+ android:background="@color/base_green_bg">
<com.dayu.baselibrary.view.TitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_title_height"
android:background="@color/title_bar_bg"
android:elevation="4dp"
- app:centerText="鎴戠殑" />
-
+ app:centerText="鍏呭��" />
<LinearLayout
android:id="@+id/recharge_read_LL"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:gravity="center"
android:layout_below="@+id/titleBar"
android:orientation="vertical"
android:visibility="visible">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_margin="16dp"
app:cardCornerRadius="8dp"
app:cardElevation="2dp">
- <LinearLayout
+ <RelativeLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
+ android:layout_height="match_parent"
android:padding="16dp">
<TextView
+ android:id="@+id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="10dp"
android:layout_marginBottom="16dp"
android:gravity="center"
- android:text="璇峰皢鍗¤创鍦ㄨ澶囦笂杩涜璇诲崱"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
+ android:text="鍏呭�艰鍗�"
+ android:textColor="@color/base_blue_bg"
+ android:textSize="@dimen/big_text_size"
android:textStyle="bold" />
- <ImageView
- android:layout_width="200dp"
- android:layout_height="200dp"
- android:layout_gravity="center"
- android:scaleType="fitCenter"
- android:src="@mipmap/nfc_write" />
- </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/textView2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginBottom="40dp"
+ android:gravity="center"
+ android:text="璇峰皢鍗¤创鍦ㄨ澶囦笂杩涜璇诲崱"
+ android:textColor="#333333"
+ android:textSize="@dimen/text_size"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:layout_width="200dp"
+ android:layout_height="200dp"
+ android:layout_below="@+id/textView2"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center"
+ android:scaleType="fitCenter"
+ android:src="@mipmap/nfc_write" />
+
+ <TextView
+ android:id="@+id/red_initCode"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ android:gravity="center"
+ android:text="璇蜂繚鎸佹墜鎸佹満鍜屽崱鐗囦笉瑕佺Щ鍔�"
+ android:textColor="#333333"
+ android:textSize="@dimen/new_card_size"
+ android:textStyle="bold" />
+ </LinearLayout>
+
+ </RelativeLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_above="@+id/recharge_registBtn"
- android:layout_below="@+id/header_layout"
- android:fillViewport="true">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="16dp">
-
- <LinearLayout
- android:id="@+id/recharge_text_LL"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:visibility="gone">
-
- <androidx.cardview.widget.CardView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
-
- app:cardCornerRadius="8dp"
- app:cardElevation="2dp">
-
- <LinearLayout
- android:id="@+id/recharge_LL"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="16dp">
-
-
- <TextView
- android:id="@+id/red_recharge_water"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:text="鍏呭�兼按閲忥細"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="gone" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#F9F9F9"
- android:orientation="vertical"
- android:padding="12dp">
-
- <TextView
- android:id="@+id/recharge_tx"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:text="鍏呭�奸噾棰濓紙鍏冿級锛�"
- android:textColor="@color/red"
- android:textSize="@dimen/new_card_size"
- android:textStyle="bold" />
-
- <EditText
- android:id="@+id/recharge_water"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@android:color/white"
- android:hint="璇疯緭鍏ュ厖鍊肩殑閲戦"
- android:inputType="numberDecimal"
- android:padding="12dp"
- android:textSize="@dimen/new_card_size" />
- </LinearLayout>
- </LinearLayout>
- </androidx.cardview.widget.CardView>
-
- <androidx.cardview.widget.CardView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="15dp"
- android:layout_marginBottom="16dp"
- app:cardCornerRadius="8dp"
- app:cardElevation="2dp">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="16dp">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="12dp"
- android:text="鍗＄墖淇℃伅"
- android:textColor="#333333"
- android:textSize="16sp"
- android:textStyle="bold" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍗＄姸鎬侊細"
- android:textColor="#666666"
- android:textSize="@dimen/text_size" />
-
- <TextView
- android:id="@+id/red_statu"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textColor="@color/red"
- android:textSize="@dimen/new_card_size" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="濮撳悕锛�"
- android:textColor="#666666"
- android:textSize="@dimen/new_card_size" />
-
- <TextView
- android:id="@+id/userName"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textColor="#333333"
- android:textSize="@dimen/new_card_size" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍗″彿锛�"
- android:textColor="#666666"
- android:textSize="@dimen/text_size" />
-
- <TextView
- android:id="@+id/red_initCode"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text=""
- android:textColor="#333333"
- android:textSize="@dimen/new_card_size" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鐢ㄦ埛缂栧彿锛�"
- android:textColor="#666666"
- android:textSize="@dimen/text_size" />
-
- <TextView
- android:id="@+id/red_userCode"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text=""
- android:textColor="#333333"
- android:textSize="@dimen/new_card_size" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:orientation="horizontal"
- android:visibility="visible">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍏呭�煎悗鍓╀綑閲戦锛�"
- android:textColor="#666666"
- android:textSize="@dimen/text_size" />
-
- <TextView
- android:id="@+id/red_remainder_blance"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textColor="#333333"
- android:textSize="@dimen/new_card_size" />
- </LinearLayout>
- </LinearLayout>
- </androidx.cardview.widget.CardView>
-
- <androidx.cardview.widget.CardView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- app:cardCornerRadius="8dp"
- app:cardElevation="2dp">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="16dp">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="12dp"
- android:text="鐢甸噺淇℃伅"
- android:textColor="#333333"
- android:textSize="16sp"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/red_balance_electric"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:text="鍓╀綑鐢甸噺锛�"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="visible" />
-
- <TextView
- android:id="@+id/red_rechargeDate"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:text="鏈�鍚庤喘姘存棩鏈燂細"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="visible" />
-
- <TextView
- android:id="@+id/red_rechargeElectric"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:text="鐢甸噺鍗曚环锛�"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="visible" />
-
- <TextView
- android:id="@+id/red_rechargeNumber"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:text="鍏呭�兼鏁帮細"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="gone" />
-
- <TextView
- android:id="@+id/red_total_water"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:text="鎬荤敤姘撮噺锛�"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="gone" />
-
- <TextView
- android:id="@+id/red_total_power"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:text="鎬荤敤鐢甸噺锛�"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="gone" />
-
- <TextView
- android:id="@+id/red_waterPrice"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:text="姣忕珛鏂圭背姘翠环鏍硷細"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="gone" />
- </LinearLayout>
- </androidx.cardview.widget.CardView>
-
-
- </LinearLayout>
- </LinearLayout>
- </ScrollView>
-
- <Button
- android:id="@+id/recharge_registBtn"
- android:layout_width="match_parent"
- android:layout_height="50dp"
- android:layout_alignParentBottom="true"
- android:layout_margin="16dp"
- android:background="@drawable/rounded_button_bg"
- android:elevation="2dp"
- android:gravity="center"
- android:text="鍏呭��"
- android:textColor="@color/white"
- android:textSize="@dimen/new_card_size"
- android:textStyle="bold"
- android:visibility="gone" />
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0