From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001 From: zuoxiao <lf_zuo@163.com> Date: 星期三, 25 六月 2025 19:49:48 +0800 Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑,增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑,提高容错性 - 改进支付方式获取方法,增加错误处理和日志记录 -调整充值接口调用参数,确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型,改为字符串处理 --- generallibrary/src/main/res/layout/fragment_my.xml | 45 +++------------------------------------------ 1 files changed, 3 insertions(+), 42 deletions(-) diff --git a/generallibrary/src/main/res/layout/fragment_my.xml b/generallibrary/src/main/res/layout/fragment_my.xml index 1494651..5140657 100644 --- a/generallibrary/src/main/res/layout/fragment_my.xml +++ b/generallibrary/src/main/res/layout/fragment_my.xml @@ -311,6 +311,7 @@ android:textStyle="bold" /> <RelativeLayout + android:id="@+id/logoutRL" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -326,38 +327,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_centerVertical="true" android:src="@drawable/ic_arrow_right"/> </RelativeLayout> - <TextView - android:id="@+id/sys_ip" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="12dp" - android:background="#F9F9F9" - android:drawableStart="@android:drawable/ic_menu_manage" - android:drawablePadding="8dp" - android:drawableTint="#666666" - android:padding="12dp" - android:text="IP璁剧疆" - android:textColor="#333333" - android:textSize="@dimen/text_size" - android:visibility="gone" /> - - <TextView - android:id="@+id/card_replacement" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="12dp" - android:background="#F9F9F9" - android:drawableStart="@android:drawable/ic_menu_edit" - android:drawablePadding="8dp" - android:drawableTint="#666666" - android:padding="12dp" - android:text="鐢ㄦ埛琛ュ崱" - android:textColor="#333333" - android:textSize="@dimen/text_size" - android:visibility="gone" /> <TextView android:id="@+id/my_psw" @@ -374,19 +347,7 @@ android:textSize="@dimen/text_size" android:visibility="gone" /> - <TextView - android:id="@+id/my_testConnect" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#F9F9F9" - android:drawableStart="@android:drawable/ic_menu_compass" - android:drawablePadding="8dp" - android:drawableTint="#666666" - android:padding="12dp" - android:text="鏈繛鎺ユ暟鎹腑蹇�" - android:textColor="#333333" - android:textSize="@dimen/text_size" - android:visibility="gone" /> + </LinearLayout> </androidx.cardview.widget.CardView> </LinearLayout> -- Gitblit v1.8.0