From a8751388c9a86ae95714a15279994d8aa426a26d Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 13 六月 2025 14:59:02 +0800
Subject: [PATCH] feat(generallibrary): 优化充值功能并添加水价获取- 在 activity_recharge_detail.xml 中移除了不必要的 bold 样式- 在 EditText 中添加了金额输入限制（数字和小数点）- 在 BaseApplication 中添加了水价信息存储 - 在 MainActivity 中实现了延时获取水价的功能- 优化了 RechargeDetailActivity 中的水价检查和使用逻辑 - 在 README.md 中添加了金额格式化和水价获取的最佳实践指南
---
qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml | 147 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 115 insertions(+), 32 deletions(-)
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
index 6c5b8e9..825e865 100644
--- a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
@@ -48,16 +48,37 @@
android:padding="20dp"
android:visibility="gone">
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鐢ㄦ埛濮撳悕锛�"
+ android:text="鍗＄姸鎬侊細"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/red_statu"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@color/red"
+ android:textSize="@dimen/new_card_size" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="濮撳悕锛�"
android:textSize="@dimen/new_card_size" />
<TextView
@@ -77,7 +98,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鐢ㄦ埛娉ㄥ唽缂栧彿锛�"
+ android:text="鍗″彿锛�"
android:textSize="@dimen/text_size" />
<TextView
@@ -93,7 +114,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:visibility="visible">
<TextView
@@ -110,48 +132,109 @@
</LinearLayout>
- <LinearLayout
+ <TextView
+ android:id="@+id/red_remainder_water"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:orientation="horizontal">
+ android:text="鍓╀綑姘撮噺锛�"
+ android:visibility="gone"
+ android:textSize="@dimen/text_size" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍗＄姸鎬侊細"
- android:textSize="@dimen/text_size" />
+ <TextView
+ android:id="@+id/red_rechargeDate"
+ 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_rechargeElectric"
+ 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_rechargeNumber"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鍏呭�兼鏁帮細"
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
- <TextView
- android:id="@+id/red_statu"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="@dimen/new_card_size" />
+ <TextView
+ android:id="@+id/red_total_water"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鎬荤敤姘撮噺锛�"
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
- </LinearLayout>
+ <TextView
+ android:id="@+id/red_total_power"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鎬荤敤鐢甸噺锛�"
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
+
+
+ <TextView
+ android:id="@+id/red_waterPrice"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="姣忕珛鏂圭背姘翠环鏍硷細"
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
<LinearLayout
android:id="@+id/recharge_LL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:orientation="horizontal">
+ android:orientation="vertical">
<TextView
- android:id="@+id/recharge_tx"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="閲戦锛堝厓锛夛細"
- android:textColor="@color/red"
- android:textSize="@dimen/new_card_size" />
-
- <EditText
- android:id="@+id/recharge_water"
+ android:id="@+id/red_recharge_water"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ュ厖鍊肩殑閲戦"
- android:inputType="numberDecimal"
- android:textSize="@dimen/new_card_size" />
+ android:layout_marginTop="15dp"
+ android:text="鍏呭�兼按閲忥細"
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
+
+
+ <TextView
+ android:id="@+id/recharge_tx"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="閲戦锛堝厓锛夛細"
+ android:textColor="@color/red"
+ android:textSize="@dimen/new_card_size" />
+
+ <EditText
+ android:id="@+id/recharge_water"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="璇疯緭鍏ュ厖鍊肩殑閲戦"
+ android:inputType="numberDecimal"
+ android:textSize="@dimen/new_card_size" />
+
+ </LinearLayout>
+
+
</LinearLayout>
</LinearLayout>
@@ -160,11 +243,11 @@
android:id="@+id/recharge_registBtn"
android:layout_width="match_parent"
android:layout_height="50dp"
- android:visibility="gone"
android:layout_alignParentBottom="true"
android:background="@color/title_bg"
android:gravity="center"
android:text="鍏呭��"
android:textColor="#000000"
- android:textSize="@dimen/new_card_size" />
+ android:textSize="@dimen/new_card_size"
+ android:visibility="gone" />
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0