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/activity_card_read.xml | 332 +++++++++++++++++++++++++++--------------------------- 1 files changed, 167 insertions(+), 165 deletions(-) diff --git a/generallibrary/src/main/res/layout/activity_card_read.xml b/generallibrary/src/main/res/layout/activity_card_read.xml index e6ab761..f7981c1 100644 --- a/generallibrary/src/main/res/layout/activity_card_read.xml +++ b/generallibrary/src/main/res/layout/activity_card_read.xml @@ -11,7 +11,8 @@ android:layout_height="@dimen/dimen_title_height" android:background="@color/title_bar_bg" android:elevation="4dp" - app:centerText="璇诲崱" /> + app:centerText="璇诲崱" + app:leftImage="@mipmap/icon_back" /> <ScrollView android:layout_width="match_parent" @@ -32,7 +33,7 @@ android:layout_height="match_parent" android:gravity="center" android:orientation="vertical" - android:visibility="gone"> + android:visibility="visible"> <androidx.cardview.widget.CardView android:layout_width="match_parent" @@ -95,7 +96,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:visibility="visible"> + android:visibility="gone"> <!-- 鍗″唴鏁版嵁鍖哄煙 --> <androidx.cardview.widget.CardView @@ -116,16 +117,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="2dp" - android:orientation="horizontal" + android:background="#F8F9FB" android:gravity="center_vertical" - android:background="#F8F9FA" + android:orientation="horizontal" android:padding="12dp"> <TextView android:layout_width="105dp" android:layout_height="wrap_content" android:text="鎸佸崱浜猴細" - android:textColor="#333333" + android:textColor="#37474F" android:textSize="@dimen/text_size" /> <TextView @@ -134,7 +135,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="--" - android:textColor="#666666" + android:textColor="#546E7A" android:textSize="@dimen/text_size" /> </LinearLayout> @@ -143,17 +144,18 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="2dp" - android:orientation="horizontal" + android:background="#E3F2FD" android:gravity="center_vertical" - android:background="#FFFFFF" + android:orientation="horizontal" android:padding="12dp"> <TextView android:layout_width="105dp" android:layout_height="wrap_content" - android:text="鍗″彿锛�" - android:textColor="#333333" - android:textSize="@dimen/text_size" /> + android:text="鍗″湴鍧�锛�" + android:textColor="#1976D2" + android:textSize="@dimen/text_size" + android:textStyle="bold" /> <TextView android:id="@+id/tv_card_number" @@ -161,167 +163,26 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="--" - android:textColor="#666666" + android:textColor="#37474F" android:textSize="@dimen/text_size" /> </LinearLayout> - - <!-- 鍗$墖绫诲瀷 --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="2dp" - android:orientation="horizontal" - android:gravity="center_vertical" - android:background="#F8F9FA" - android:padding="12dp"> - - <TextView - android:layout_width="105dp" - android:layout_height="wrap_content" - android:text="鍗$被鍨嬶細" - android:textColor="#333333" - android:textSize="@dimen/text_size" /> - - <TextView - android:id="@+id/tv_card_type" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="--" - android:textColor="#666666" - android:textSize="@dimen/text_size" /> - </LinearLayout> - - <!-- 鍗″唴浣欓 --> - <LinearLayout - android:id="@+id/ll_card_balance" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="2dp" - android:orientation="horizontal" - android:visibility="visible" - android:gravity="center_vertical" - android:background="#FFFFFF" - android:padding="12dp"> - - <TextView - android:layout_width="105dp" - android:layout_height="wrap_content" - android:text="鍗′綑棰濓細" - android:textColor="#333333" - android:textSize="@dimen/text_size" /> - - <TextView - android:id="@+id/tv_card_balance" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="0.00鍏�" - android:textColor="#FF6B35" - android:textSize="@dimen/text_size" - android:textStyle="bold" /> - </LinearLayout> - - <!-- 鐢ㄦ埛缂栧彿 --> - <LinearLayout - android:id="@+id/ll_user_number" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="2dp" - android:orientation="horizontal" - android:visibility="visible" - android:gravity="center_vertical" - android:background="#F8F9FA" - android:padding="12dp"> - - <TextView - android:layout_width="105dp" - android:layout_height="wrap_content" - android:text="鐢ㄦ埛缂栧彿锛�" - android:textColor="#333333" - android:textSize="@dimen/text_size" /> - - <TextView - android:id="@+id/tv_user_number" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="--" - android:textColor="#666666" - android:textSize="@dimen/text_size" /> - </LinearLayout> - - <!-- 鎵嬫満鍙� --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="2dp" - android:orientation="horizontal" - android:gravity="center_vertical" - android:background="#FFFFFF" - android:padding="12dp"> - - <TextView - android:layout_width="105dp" - android:layout_height="wrap_content" - android:text="鎵嬫満鍙凤細" - android:textColor="#333333" - android:textSize="@dimen/text_size" /> - - <TextView - android:id="@+id/tv_phone" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="--" - android:textColor="#666666" - android:textSize="@dimen/text_size" /> - </LinearLayout> - - <!-- 韬唤璇佸彿 --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="2dp" - android:orientation="horizontal" - android:gravity="center_vertical" - android:background="#F8F9FA" - android:padding="12dp"> - - <TextView - android:layout_width="105dp" - android:layout_height="wrap_content" - android:text="韬唤璇佸彿锛�" - android:textColor="#333333" - android:textSize="@dimen/text_size" /> - - <TextView - android:id="@+id/tv_id_card" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="--" - android:textColor="#666666" - android:textSize="@dimen/text_size" /> - </LinearLayout> - <!-- 鍗$墖鐘舵�� --> <LinearLayout android:id="@+id/ll_card_status" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="2dp" - android:orientation="horizontal" - android:visibility="visible" - android:gravity="center_vertical" android:background="#FFFFFF" - android:padding="12dp"> + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="12dp" + android:visibility="visible"> <TextView android:layout_width="105dp" android:layout_height="wrap_content" android:text="鍗$墖鐘舵�侊細" - android:textColor="#333333" + android:textColor="#37474F" android:textSize="@dimen/text_size" /> <TextView @@ -331,8 +192,149 @@ android:layout_weight="1" android:text="姝e父" android:textColor="#4CAF50" + android:textSize="@dimen/text_size" + android:textStyle="bold" /> + </LinearLayout> + <!-- 鍗$墖绫诲瀷 --> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="2dp" + android:background="#F8F9FB" + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="12dp"> + + <TextView + android:layout_width="105dp" + android:layout_height="wrap_content" + android:text="鍗$被鍨嬶細" + android:textColor="#37474F" + android:textSize="@dimen/text_size" /> + + <TextView + android:id="@+id/tv_card_type" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="--" + android:textColor="#546E7A" android:textSize="@dimen/text_size" /> </LinearLayout> + + <!-- 鍗″唴浣欓 --> + <LinearLayout + android:id="@+id/ll_card_balance" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="2dp" + android:background="#FFF8E1" + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="12dp" + android:visibility="visible"> + + <TextView + android:layout_width="105dp" + android:layout_height="wrap_content" + android:text="鍗′綑棰濓細" + android:textColor="#37474F" + android:textSize="@dimen/text_size" /> + + <TextView + android:id="@+id/tv_card_balance" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="0.00鍏�" + android:textColor="#FF8F00" + android:textSize="@dimen/text_size" + android:textStyle="bold" /> + </LinearLayout> + + <!-- 鍗$紪鍙� --> + <LinearLayout + android:id="@+id/ll_user_number" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="2dp" + android:background="#F8F9FB" + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="12dp" + android:visibility="visible"> + + <TextView + android:layout_width="105dp" + android:layout_height="wrap_content" + android:text="鍗$紪鍙凤細" + android:textColor="#37474F" + android:textSize="@dimen/text_size" /> + + <TextView + android:id="@+id/tv_user_number" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="--" + android:textColor="#546E7A" + android:textSize="@dimen/text_size" /> + </LinearLayout> + + <!-- 鎵嬫満鍙� --> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="2dp" + android:background="#FFFFFF" + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="12dp"> + + <TextView + android:layout_width="105dp" + android:layout_height="wrap_content" + android:text="鎵嬫満鍙凤細" + android:textColor="#37474F" + android:textSize="@dimen/text_size" /> + + <TextView + android:id="@+id/tv_phone" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="--" + android:textColor="#546E7A" + android:textSize="@dimen/text_size" /> + </LinearLayout> + + <!-- 韬唤璇佸彿 --> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="2dp" + android:background="#F8F9FB" + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="12dp"> + + <TextView + android:layout_width="105dp" + android:layout_height="wrap_content" + android:text="韬唤璇佸彿锛�" + android:textColor="#37474F" + android:textSize="@dimen/text_size" /> + + <TextView + android:id="@+id/tv_id_card" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="--" + android:textColor="#546E7A" + android:textSize="@dimen/text_size" /> + </LinearLayout> + <!-- 鏈�鍚庝娇鐢ㄦ椂闂� --> <LinearLayout @@ -340,17 +342,17 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="2dp" - android:orientation="horizontal" - android:visibility="visible" + android:background="#FFFFFF" android:gravity="center_vertical" - android:background="#F8F9FA" - android:padding="12dp"> + android:orientation="horizontal" + android:padding="12dp" + android:visibility="visible"> <TextView android:layout_width="105dp" android:layout_height="wrap_content" android:text="鏈�鍚庡厖鍊兼椂闂达細" - android:textColor="#333333" + android:textColor="#37474F" android:textSize="@dimen/text_size" /> <TextView @@ -359,7 +361,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="--" - android:textColor="#666666" + android:textColor="#546E7A" android:textSize="@dimen/text_size" /> </LinearLayout> -- Gitblit v1.8.0