refactor(generallibrary):优化补卡界面布局和样式- 调整了卡片信息展示区域的样式，包括背景色、文字颜色等 - 优化了输入区域的...

zuoxiao

2 天以前 cece79bf75a9b672b33b772acffca209eecfc8f2

refactor(generallibrary):优化补卡界面布局和样式- 调整了卡片信息展示区域的样式，包括背景色、文字颜色等
- 优化了输入区域的布局结构，减小了控件间距和尺寸- 更新了确认补卡按钮的样式
- 统一了文字大小和颜色，提高了可读性

 generallibrary/src/main/java/com/dayu/general/activity/CardReplaceActivity.kt

@@ -3,23 +3,17 @@
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.util.TypedValue
import android.view.View
import android.widget.RadioButton
import android.widget.Toast
import com.dayu.baselibrary.net.subscribers.SubscriberListener
import com.dayu.baselibrary.utils.MornyUtil
import com.dayu.baselibrary.utils.ToastUtil
import com.dayu.baselibrary.view.TipDialog
import com.dayu.baselibrary.view.TitleBar
import com.dayu.general.BaseApplication
import com.dayu.general.R
import com.dayu.general.bean.card.UserCard
import com.dayu.general.bean.net.CardInfoResult
import com.dayu.general.bean.net.CardInfoByClientResult
import com.dayu.general.bean.net.CardInfoResult
import com.dayu.general.bean.net.CardReplaceResult
import com.dayu.general.bean.net.PaymentMethod
import com.dayu.general.bean.net.PaymentMethodResponse
import com.dayu.general.databinding.ActivityCardReplaceBinding
import com.dayu.general.net.ApiManager
import com.dayu.general.net.BaseResponse
@@ -181,7 +175,9 @@
                }

                else -> {

                    showConfirmDialog("当前非白卡") {
                        resetToReadingState()
                    }
                }
            }


 generallibrary/src/main/res/layout/activity_card_read.xml

@@ -117,7 +117,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#F8F9FA"
                            android:background="#F8F9FB"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp">
@@ -126,7 +126,7 @@
                                android:layout_width="105dp"
                                android:layout_height="wrap_content"
                                android:text="持卡人："
                                android:textColor="#333333"
                                android:textColor="#37474F"
                                android:textSize="@dimen/text_size" />

                            <TextView
@@ -135,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>

@@ -144,7 +144,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#FFFFFF"
                            android:background="#E3F2FD"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp">
@@ -153,8 +153,9 @@
                                android:layout_width="105dp"
                                android:layout_height="wrap_content"
                                android:text="卡地址："
                                android:textColor="#333333"
                                android:textSize="@dimen/text_size" />
                                android:textColor="#1976D2"
                                android:textSize="@dimen/text_size"
                                android:textStyle="bold" />

                            <TextView
                                android:id="@+id/tv_card_number"
@@ -162,7 +163,7 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="--"
                                android:textColor="#666666"
                                android:textColor="#37474F"
                                android:textSize="@dimen/text_size" />
                        </LinearLayout>
                        <!-- 卡片状态 -->
@@ -181,7 +182,7 @@
                                android:layout_width="105dp"
                                android:layout_height="wrap_content"
                                android:text="卡片状态："
                                android:textColor="#333333"
                                android:textColor="#37474F"
                                android:textSize="@dimen/text_size" />

                            <TextView
@@ -191,14 +192,15 @@
                                android:layout_weight="1"
                                android:text="正常"
                                android:textColor="#4CAF50"
                                android:textSize="@dimen/text_size" />
                                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="#F8F9FA"
                            android:background="#F8F9FB"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp">
@@ -207,7 +209,7 @@
                                android:layout_width="105dp"
                                android:layout_height="wrap_content"
                                android:text="卡类型："
                                android:textColor="#333333"
                                android:textColor="#37474F"
                                android:textSize="@dimen/text_size" />

                            <TextView
@@ -216,7 +218,7 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="--"
                                android:textColor="#666666"
                                android:textColor="#546E7A"
                                android:textSize="@dimen/text_size" />
                        </LinearLayout>

@@ -226,7 +228,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#FFFFFF"
                            android:background="#FFF8E1"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp"
@@ -236,7 +238,7 @@
                                android:layout_width="105dp"
                                android:layout_height="wrap_content"
                                android:text="卡余额："
                                android:textColor="#333333"
                                android:textColor="#37474F"
                                android:textSize="@dimen/text_size" />

                            <TextView
@@ -245,7 +247,7 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="0.00元"
                                android:textColor="#FF6B35"
                                android:textColor="#FF8F00"
                                android:textSize="@dimen/text_size"
                                android:textStyle="bold" />
                        </LinearLayout>
@@ -256,7 +258,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#F8F9FA"
                            android:background="#F8F9FB"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp"
@@ -266,7 +268,7 @@
                                android:layout_width="105dp"
                                android:layout_height="wrap_content"
                                android:text="卡编号："
                                android:textColor="#333333"
                                android:textColor="#37474F"
                                android:textSize="@dimen/text_size" />

                            <TextView
@@ -275,7 +277,7 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="--"
                                android:textColor="#666666"
                                android:textColor="#546E7A"
                                android:textSize="@dimen/text_size" />
                        </LinearLayout>

@@ -293,7 +295,7 @@
                                android:layout_width="105dp"
                                android:layout_height="wrap_content"
                                android:text="手机号："
                                android:textColor="#333333"
                                android:textColor="#37474F"
                                android:textSize="@dimen/text_size" />

                            <TextView
@@ -302,7 +304,7 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="--"
                                android:textColor="#666666"
                                android:textColor="#546E7A"
                                android:textSize="@dimen/text_size" />
                        </LinearLayout>

@@ -311,7 +313,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#F8F9FA"
                            android:background="#F8F9FB"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp">
@@ -320,7 +322,7 @@
                                android:layout_width="105dp"
                                android:layout_height="wrap_content"
                                android:text="身份证号："
                                android:textColor="#333333"
                                android:textColor="#37474F"
                                android:textSize="@dimen/text_size" />

                            <TextView
@@ -329,7 +331,7 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="--"
                                android:textColor="#666666"
                                android:textColor="#546E7A"
                                android:textSize="@dimen/text_size" />
                        </LinearLayout>

@@ -340,7 +342,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#F8F9FA"
                            android:background="#FFFFFF"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp"
@@ -350,7 +352,7 @@
                                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>


 generallibrary/src/main/res/layout/activity_card_replace.xml

@@ -27,7 +27,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:orientation="vertical"
            android:padding="16dp">
            android:padding="12dp">

            <LinearLayout
                android:id="@+id/card_read_LL"
@@ -39,25 +39,25 @@
                <androidx.cardview.widget.CardView
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:layout_marginBottom="16dp"
                    app:cardCornerRadius="8dp"
                    android:layout_marginBottom="12dp"
                    app:cardCornerRadius="6dp"
                    app:cardElevation="2dp">

                    <RelativeLayout
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
                        android:padding="16dp">
                        android:padding="12dp">

                        <TextView
                            android:id="@+id/tv_title"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="100dp"
                            android:layout_marginBottom="60dp"
                            android:gravity="center"
                            android:text="补卡操作"
                            android:layout_marginTop="20dp"
                            android:layout_marginTop="16dp"
                            android:textColor="@color/base_blue_bg"
                            android:textSize="@dimen/big_text_size"
                            android:textSize="18sp"
                            android:textStyle="bold" />

                        <TextView
@@ -65,20 +65,20 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_below="@+id/tv_title"
                            android:layout_marginBottom="20dp"
                            android:layout_marginBottom="16dp"
                            android:gravity="center"
                            android:text="请将新卡贴在设备上进行读取"
                            android:textColor="#333333"
                            android:textSize="@dimen/text_size"
                            android:textSize="16sp"
                            android:textStyle="bold" />

                        <ImageView
                            android:id="@+id/iv_nfc"
                            android:layout_width="120dp"
                            android:layout_height="120dp"
                            android:layout_width="80dp"
                            android:layout_height="80dp"
                            android:layout_below="@+id/tv_subtitle"
                            android:layout_centerHorizontal="true"
                            android:layout_marginBottom="20dp"
                            android:layout_marginBottom="16dp"
                            android:scaleType="fitCenter"
                            android:src="@mipmap/nfc_write" />

@@ -90,7 +90,7 @@
                            android:gravity="center"
                            android:text="读取新卡后将显示原卡信息进行补卡操作"
                            android:textColor="#666666"
                            android:textSize="@dimen/new_card_size" />
                            android:textSize="14sp" />

                    </RelativeLayout>
                </androidx.cardview.widget.CardView>
@@ -107,14 +107,14 @@
        android:layout_above="@+id/bottom_button_container"
        android:layout_below="@+id/titleBar"
        android:orientation="vertical"
        android:visibility="visible">
        android:visibility="gone">

        <ScrollView
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_weight="1"
            android:fillViewport="true"
            android:padding="12dp">
            android:padding="10dp">

            <LinearLayout
                android:layout_width="match_parent"
@@ -126,18 +126,18 @@
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    app:cardCornerRadius="8dp"
                    app:cardElevation="3dp">
                    app:cardElevation="4dp">

                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="vertical"
                        android:padding="20dp">
                        android:padding="16dp">

                        <TextView
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="16dp"
                            android:layout_marginBottom="12dp"
                            android:text="卡片信息"
                            android:textColor="@color/base_blue_bg"
                            android:textSize="20sp"
@@ -148,7 +148,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#F8F9FA"
                            android:background="#E3F2FD"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp">
@@ -157,8 +157,8 @@
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:text="新卡卡地址："
                                android:textColor="#333333"
                                android:textSize="17sp"
                                android:textColor="#1976D2"
                                android:textSize="16sp"
                                android:textStyle="bold" />

                            <TextView
@@ -166,11 +166,11 @@
                                android:layout_width="0dp"
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:background="#F5F5F5"
                                android:padding="12dp"
                                android:background="#FFFFFF"
                                android:padding="10dp"
                                android:text="--"
                                android:textColor="#333333"
                                android:textSize="17sp"
                                android:textSize="15sp"
                                android:textIsSelectable="true" />
                        </LinearLayout>
                        
@@ -181,66 +181,61 @@
                            android:layout_marginBottom="4dp"
                            android:background="@color/base_blue_bg" />
                            
                        <!-- 持卡人和卡片状态 - 同一行显示 -->
                        <!-- 持卡人 -->
                        <LinearLayout
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginTop="4dp"
                            android:layout_marginBottom="2dp"
                            android:background="#FFFFFF"
                            android:background="#F8F9FB"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp">

                            <!-- 持卡人 -->
                            <LinearLayout
                            <TextView
                                android:layout_width="85dp"
                                android:layout_height="wrap_content"
                                android:text="持卡人："
                                android:textColor="#37474F"
                                android:textSize="15sp"
                                android:textStyle="bold" />

                            <TextView
                                android:id="@+id/tv_user_name"
                                android:layout_width="0dp"
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:orientation="vertical">
                                android:text="--"
                                android:textColor="#546E7A"
                                android:textSize="15sp" />
                        </LinearLayout>

                                <TextView
                                    android:layout_width="wrap_content"
                                    android:layout_height="wrap_content"
                                    android:text="持卡人"
                                    android:textColor="#333333"
                                    android:textSize="15sp"
                                    android:textStyle="bold" />
                        <!-- 卡片状态 -->
                        <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:id="@+id/tv_user_name"
                                    android:layout_width="wrap_content"
                                    android:layout_height="wrap_content"
                                    android:layout_marginTop="6dp"
                                    android:text="--"
                                    android:textColor="#666666"
                                    android:textSize="17sp" />
                            </LinearLayout>
                            <TextView
                                android:layout_width="85dp"
                                android:layout_height="wrap_content"
                                android:text="卡片状态："
                                android:textColor="#37474F"
                                android:textSize="15sp"
                                android:textStyle="bold" />

                            <!-- 卡片状态 -->
                            <LinearLayout
                            <TextView
                                android:id="@+id/tv_card_status"
                                android:layout_width="0dp"
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:orientation="vertical">

                                <TextView
                                    android:layout_width="wrap_content"
                                    android:layout_height="wrap_content"
                                    android:text="卡片状态"
                                    android:textColor="#333333"
                                    android:textSize="15sp"
                                    android:textStyle="bold" />

                                <TextView
                                    android:id="@+id/tv_card_status"
                                    android:layout_width="wrap_content"
                                    android:layout_height="wrap_content"
                                    android:layout_marginTop="6dp"
                                    android:text="正常"
                                    android:textColor="#4CAF50"
                                    android:textSize="17sp"
                                    android:textStyle="bold" />
                            </LinearLayout>
                                android:text="正常"
                                android:textColor="#4CAF50"
                                android:textSize="15sp"
                                android:textStyle="bold" />
                        </LinearLayout>

                        <!-- 卡号 -->
@@ -248,17 +243,17 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#F8F9FA"
                            android:background="#F8F9FB"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp">

                            <TextView
                                android:layout_width="90dp"
                                android:layout_width="85dp"
                                android:layout_height="wrap_content"
                                android:text="卡号："
                                android:textColor="#333333"
                                android:textSize="16sp"
                                android:textColor="#37474F"
                                android:textSize="15sp"
                                android:textStyle="bold" />

                            <TextView
@@ -267,8 +262,8 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="--"
                                android:textColor="#666666"
                                android:textSize="16sp" />
                                android:textColor="#546E7A"
                                android:textSize="15sp" />
                        </LinearLayout>

                        <!-- 客户编号 -->
@@ -282,11 +277,11 @@
                            android:padding="12dp">

                            <TextView
                                android:layout_width="90dp"
                                android:layout_width="85dp"
                                android:layout_height="wrap_content"
                                android:text="客户编号："
                                android:textColor="#333333"
                                android:textSize="16sp"
                                android:textColor="#37474F"
                                android:textSize="15sp"
                                android:textStyle="bold" />

                            <TextView
@@ -295,8 +290,8 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="--"
                                android:textColor="#666666"
                                android:textSize="16sp" />
                                android:textColor="#546E7A"
                                android:textSize="15sp" />
                        </LinearLayout>

                        <!-- 手机号 -->
@@ -304,17 +299,17 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#F8F9FA"
                            android:background="#F8F9FB"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp">

                            <TextView
                                android:layout_width="90dp"
                                android:layout_width="85dp"
                                android:layout_height="wrap_content"
                                android:text="手机号："
                                android:textColor="#333333"
                                android:textSize="16sp"
                                android:textColor="#37474F"
                                android:textSize="15sp"
                                android:textStyle="bold" />

                            <TextView
@@ -323,8 +318,8 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="--"
                                android:textColor="#666666"
                                android:textSize="16sp" />
                                android:textColor="#546E7A"
                                android:textSize="15sp" />
                        </LinearLayout>
                        
                        <!-- 卡内余额 -->
@@ -332,17 +327,17 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:layout_marginBottom="2dp"
                            android:background="#FFFFFF"
                            android:background="#FFF8E1"
                            android:gravity="center_vertical"
                            android:orientation="horizontal"
                            android:padding="12dp">

                            <TextView
                                android:layout_width="90dp"
                                android:layout_width="85dp"
                                android:layout_height="wrap_content"
                                android:text="卡内余额："
                                android:textColor="#333333"
                                android:textSize="16sp"
                                android:textColor="#37474F"
                                android:textSize="15sp"
                                android:textStyle="bold" />

                            <TextView
@@ -351,8 +346,8 @@
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="0.00元"
                                android:textColor="#FF6B35"
                                android:textSize="18sp"
                                android:textColor="#FF8F00"
                                android:textSize="17sp"
                                android:textStyle="bold" />
                        </LinearLayout>

@@ -372,44 +367,44 @@
        android:background="#FFFFFF"
        android:elevation="4dp"
        android:orientation="vertical"
        android:padding="20dp"
        android:visibility="visible">
        android:padding="12dp"
        android:visibility="gone">

        <!-- 工本费和返回金额输入区域 -->
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
            android:layout_marginBottom="20dp">
            android:layout_marginBottom="12dp">
            <!-- 返回金额输入 -->
            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:layout_marginEnd="12dp"
                android:layout_marginEnd="8dp"
                android:orientation="vertical">

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginBottom="8dp"
                    android:layout_marginBottom="6dp"
                    android:text="返回金额（元）"
                    android:textColor="#333333"
                    android:textSize="16sp"
                    android:textSize="14sp"
                    android:textStyle="bold" />

                <EditText
                    android:id="@+id/et_return_amount"
                    android:layout_width="match_parent"
                    android:layout_height="56dp"
                    android:layout_height="44dp"
                    android:background="@drawable/edit_text_bg"
                    android:hint="返回金额"
                    android:inputType="numberDecimal"
                    android:padding="16dp"
                    android:padding="12dp"
                    android:text=""
                    android:textColor="#333333"
                    android:textColorHint="#999999"
                    android:textSize="18sp" />
                    android:textSize="16sp" />
            </LinearLayout>

            <!-- 工本费输入 -->
@@ -417,30 +412,30 @@
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:layout_marginStart="12dp"
                android:layout_marginStart="8dp"
                android:orientation="vertical">

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginBottom="8dp"
                    android:layout_marginBottom="6dp"
                    android:text="工本费（元）"
                    android:textColor="#333333"
                    android:textSize="16sp"
                    android:textSize="14sp"
                    android:textStyle="bold" />

                <EditText
                    android:id="@+id/et_card_cost"
                    android:layout_width="match_parent"
                    android:layout_height="56dp"
                    android:layout_height="44dp"
                    android:background="@drawable/edit_text_bg"
                    android:hint="工本费"
                    android:inputType="numberDecimal"
                    android:padding="16dp"
                    android:padding="12dp"
                    android:text=""
                    android:textColor="#333333"
                    android:textColorHint="#999999"
                    android:textSize="18sp" />
                    android:textSize="16sp" />
            </LinearLayout>

        </LinearLayout>
@@ -449,11 +444,11 @@
        <Button
            android:id="@+id/btn_replace"
            android:layout_width="match_parent"
            android:layout_height="56dp"
            android:layout_height="48dp"
            android:background="@drawable/button_blue_bg"
            android:text="确认补卡"
            android:textColor="#FFFFFF"
            android:textSize="20sp"
            android:textSize="18sp"
            android:textStyle="bold" />

    </LinearLayout>