From 1e2d09f0009c16ac36f199e1723bbe31dc335657 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 五月 2025 17:54:09 +0800
Subject: [PATCH] feat(generallibrary): 优化开卡流程和界面
---
generallibrary/src/main/res/layout/activity_new_card_1_ge.xml | 119 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/generallibrary/src/main/res/layout/activity_new_card_1_ge.xml b/generallibrary/src/main/res/layout/activity_new_card_1_ge.xml
index 4567eec..00120ac 100644
--- a/generallibrary/src/main/res/layout/activity_new_card_1_ge.xml
+++ b/generallibrary/src/main/res/layout/activity_new_card_1_ge.xml
@@ -24,7 +24,7 @@
android:layout_marginTop="24dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="24dp"
- android:visibility="visible"
+ android:visibility="gone"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="12dp"
app:cardElevation="4dp"
@@ -85,8 +85,8 @@
android:layout_height="0dp"
android:fillViewport="true"
android:scrollbars="none"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:visibility="visible"
+ app:layout_constraintBottom_toTopOf="@+id/newCard_registBtn"
app:layout_constraintTop_toBottomOf="@+id/titleBar">
<LinearLayout
@@ -236,7 +236,51 @@
android:textColor="#333333"
android:textSize="18sp"
android:textStyle="bold" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="12dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+ <TextView
+ android:layout_width="105dp"
+ android:layout_height="wrap_content"
+ android:text="宸ユ湰璐癸細"
+ android:textColor="#666666"
+ android:textSize="@dimen/new_card_size" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/edit_text_bg_selector"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp">
+
+ <EditText
+ android:id="@+id/newCard_cardFee"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:hint="璇疯緭鍏ュ伐鏈垂(閫夊～)"
+ android:inputType="numberDecimal"
+ android:textColor="#333333"
+ android:textColorHint="#BBBBBB"
+ android:textSize="@dimen/new_card_size" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍏�"
+ android:textColor="#666666"
+ android:textSize="@dimen/new_card_size" />
+ </LinearLayout>
+ </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -283,51 +327,7 @@
</LinearLayout>
</LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="12dp"
- android:gravity="center_vertical"
- android:orientation="horizontal">
- <TextView
- android:layout_width="105dp"
- android:layout_height="wrap_content"
- android:text="宸ユ湰璐癸細"
- android:textColor="#666666"
- android:textSize="@dimen/new_card_size" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/edit_text_bg_selector"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:paddingStart="10dp"
- android:paddingEnd="10dp"
- android:paddingTop="8dp"
- android:paddingBottom="8dp">
-
- <EditText
- android:id="@+id/newCard_cardFee"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:background="@null"
- android:hint="璇疯緭鍏ュ伐鏈垂(閫夊～)"
- android:inputType="numberDecimal"
- android:textColor="#333333"
- android:textColorHint="#BBBBBB"
- android:textSize="@dimen/new_card_size" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍏�"
- android:textColor="#666666"
- android:textSize="@dimen/new_card_size" />
- </LinearLayout>
- </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -397,18 +397,21 @@
</RadioGroup>
</LinearLayout>
</androidx.cardview.widget.CardView>
- <TextView
- android:id="@+id/newCard_registBtn"
- android:layout_width="match_parent"
- android:layout_height="56dp"
- android:layout_marginTop="15dp"
- android:background="@color/bottom_color"
- android:visibility="visible"
- android:gravity="center"
- android:text="纭寮�鍗�"
- android:textColor="#FFFFFF"
- android:textSize="16sp" />
</LinearLayout>
</ScrollView>
+
+ <TextView
+ android:id="@+id/newCard_registBtn"
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:background="@color/bottom_color"
+ android:gravity="center"
+ android:text="纭寮�鍗�"
+ android:textColor="#FFFFFF"
+ android:textSize="16sp"
+ android:visibility="visible"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0