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 类型，改为字符串处理
---
henanlibrary/src/main/res/layout/activity_my_hn.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/henanlibrary/src/main/res/layout/activity_my_hn.xml b/henanlibrary/src/main/res/layout/activity_my_hn.xml
index 9491b96..783c6d9 100644
--- a/henanlibrary/src/main/res/layout/activity_my_hn.xml
+++ b/henanlibrary/src/main/res/layout/activity_my_hn.xml
@@ -35,12 +35,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="璁惧搴忓垪鍙凤細"
+ android:textColor="@color/picker_text_color"
android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/my_villageNum"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:textColor="@color/picker_text_color"
android:textSize="@dimen/text_size" />
</LinearLayout>
@@ -57,14 +59,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍦板潃淇℃伅锛�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/my_adminName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
</LinearLayout>
@@ -83,7 +85,7 @@
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/my_newCardOut"
android:text="寮�鎴疯褰�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
<TextView
@@ -92,7 +94,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="瀵煎嚭璁板綍"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
</RelativeLayout>
@@ -108,7 +110,7 @@
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/my_rechargeOut"
android:text="鍏呭�艰褰�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
<TextView
@@ -117,12 +119,10 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="瀵煎嚭璁板綍"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
</RelativeLayout>
-
-
<TextView
@@ -131,7 +131,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鐢ㄦ埛琛ュ崱"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
@@ -141,7 +141,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鐧诲綍瀵嗙爜璁剧疆"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
<TextView
@@ -150,7 +150,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鏈繛鎺ユ暟鎹腑蹇�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
</LinearLayout>
--
Gitblit v1.8.0