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 类型，改为字符串处理
---
qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml b/qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml
index 4799161..262a752 100644
--- a/qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml
+++ b/qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -16,14 +16,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_above="@id/read_btn"
android:orientation="vertical"
+ android:layout_below="@id/titleBar"
android:padding="30dp">
<TextView
android:id="@+id/red_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
-
android:text="鐢ㄦ埛濮撳悕锛�"
android:textSize="@dimen/text_size" />
@@ -37,35 +38,64 @@
android:textSize="@dimen/text_size" />
<TextView
+ android:id="@+id/red_userCode"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="褰撳墠鍗″彿锛�"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
android:id="@+id/red_remainder_morny"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鍏呭�奸噾棰濓細"
android:textSize="@dimen/text_size" />
+
<TextView
- android:id="@+id/red_recharge_water"
+ android:id="@+id/red_deductionMorny"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="鍏呭�兼按閲忥細"
+ android:text="鍏呭�奸噾棰濓細"
android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/red_recharge_balance"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鍓╀綑閲戦锛�"
+ android:textSize="@dimen/text_size" />
+
<TextView
android:id="@+id/red_remainder_blance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鍓╀綑閲戦锛�"
- android:visibility="gone"
- android:textSize="@dimen/text_size" />
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
+
<TextView
- android:id="@+id/red_surplusWater"
+ android:id="@+id/red_rechargeElectric"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="鍓╀綑姘撮噺锛�"
- android:visibility="gone"
- android:textSize="@dimen/text_size" />
+ android:text="鍏呭�肩數閲忥細"
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
+
+ <TextView
+ android:id="@+id/red_surplusElectric"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鍓╀綑鐢甸噺锛�"
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
+
<TextView
android:id="@+id/red_rechargeDate"
android:layout_width="match_parent"
@@ -103,4 +133,15 @@
android:textSize="@dimen/text_size" />
</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+ <TextView
+ android:id="@+id/read_btn"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_alignParentBottom="true"
+ android:background="@color/title_bg"
+ android:gravity="center"
+ android:text="鍐嶆鎵撳嵃鍑潯"
+ android:textColor="#000000"
+ android:textSize="@dimen/new_card_size"
+ android:visibility="invisible" />
+</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0