From 87e5604ad04c0b7aaacf3d52bae85e62d308cb6d Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期四, 26 六月 2025 16:41:02 +0800
Subject: [PATCH] refactor(generallibrary):重构开卡成功界面并移除未使用的开卡界面
---
generallibrary/src/main/res/layout/fragment_recharge.xml | 336 +++----------------------------------------------------
1 files changed, 19 insertions(+), 317 deletions(-)
diff --git a/generallibrary/src/main/res/layout/fragment_recharge.xml b/generallibrary/src/main/res/layout/fragment_recharge.xml
index 0c190b0..8d8c8fe 100644
--- a/generallibrary/src/main/res/layout/fragment_recharge.xml
+++ b/generallibrary/src/main/res/layout/fragment_recharge.xml
@@ -4,13 +4,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
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="鍏呭��" />
<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">
@@ -19,7 +25,6 @@
android:layout_height="match_parent"
android:layout_margin="16dp"
app:cardCornerRadius="8dp"
-
app:cardElevation="2dp">
<RelativeLayout
@@ -53,7 +58,6 @@
android:layout_centerVertical="true"
android:layout_marginBottom="40dp"
android:gravity="center"
-
android:text="璇峰皢鍗¤创鍦ㄨ澶囦笂杩涜璇诲崱"
android:textColor="#333333"
android:textSize="@dimen/text_size"
@@ -67,323 +71,21 @@
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:fillViewport="true"
- android:visibility="gone">
-
- <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="visible">
-
-
- <androidx.cardview.widget.CardView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
- app:cardCornerRadius="8dp"
- app:cardElevation="2dp">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="12dp">
-
- <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="5dp"
- 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="5dp"
- 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="5dp"
- 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="5dp"
- 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="5dp"
- 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"
-
- 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="12dp">
-
-
- <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="@color/base_green_bg"
- 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_morny"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@android:color/white"
- android:hint="璇疯緭鍏ュ厖鍊肩殑閲戦"
- android:inputType="numberDecimal"
- android:padding="5dp"
- android:textSize="@dimen/new_card_size" />
-
- <EditText
- android:id="@+id/recharge_water"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:background="@android:color/white"
- android:hint="璇疯緭鍏ヨ禒閫佺殑閲戦(閫夊～)"
- android:inputType="numberDecimal"
- android:padding="5dp"
- 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="10dp"
- app:cardCornerRadius="8dp"
- app:cardElevation="2dp">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="12dp">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
- android:text="鏀粯鏂瑰紡"
- android:textColor="#333333"
- android:textSize="18sp"
- android:textStyle="bold" />
-
- <RadioGroup
- android:id="@+id/newCard_paymentMethod"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <RadioButton
- android:id="@+id/newCard_cashPayment"
- android:layout_width="0dp"
- android:layout_height="40dp"
- android:layout_marginRight="15dp"
- android:layout_weight="1"
- android:background="@drawable/radio_selector"
- android:button="@null"
- android:checked="true"
- android:gravity="center"
-
- android:text="鐜伴噾"
- android:textColor="@color/radio_button_text_color"
- android:textSize="@dimen/new_card_size" />
-
- <RadioButton
- android:id="@+id/newCard_posPayment"
- android:layout_width="0dp"
- android:layout_height="40dp"
- android:layout_marginRight="15dp"
- android:layout_weight="1"
- android:background="@drawable/radio_selector"
- android:button="@null"
- android:gravity="center"
-
- android:text="POS鏈�"
- android:textColor="@color/radio_button_text_color"
- android:textSize="@dimen/new_card_size" />
-
- <RadioButton
- android:id="@+id/newCard_bankTransfer"
- android:layout_width="0dp"
- android:layout_height="40dp"
- android:layout_weight="1"
- android:background="@drawable/radio_selector"
- android:button="@null"
- android:gravity="center"
-
- android:text="閾惰杞处"
- android:textColor="@color/radio_button_text_color"
- android:textSize="@dimen/new_card_size" />
- </RadioGroup>
- </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_marginLeft="16dp"
- android:layout_marginTop="10dp"
- android:layout_marginRight="16dp"
- android:layout_marginBottom="10dp"
- android:background="@drawable/recharge_button_ripple"
- 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