From b6779014ad6b2627d0a7e4d170d918d001fc03db Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 08 五月 2024 10:44:01 +0800
Subject: [PATCH] 1.修复16进制低位在前高位在后转换成10进制时的bug 2.完成充值相关功能 3.优化导出记录相关信息
---
qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml b/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
index 61b91fa..f0b5b90 100644
--- a/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="鐢ㄦ埛濮撳悕锛�"
+ android:text="濮撳悕锛�"
android:textSize="@dimen/text_size" />
<LinearLayout
@@ -43,7 +43,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鐢ㄦ埛娉ㄥ唽缂栧彿锛�"
+ android:text="鍗″彿锛�"
android:textSize="@dimen/text_size" />
<TextView
@@ -62,24 +62,49 @@
android:layout_marginTop="15dp"
android:text="鍓╀綑閲戦锛�"
android:textSize="@dimen/text_size" />
+ <TextView
+ android:id="@+id/red_remainder_water"
+ 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_rechargeDate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="鏈崱鏈�鍚庤喘姘存棩鏈燂細"
+ android:text="鏈�鍚庤喘姘存棩鏈燂細"
android:textSize="@dimen/text_size"
- android:visibility="gone" />
+ 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:text="鍏呭�兼鏁帮細"
android:textSize="@dimen/text_size"
- android:visibility="gone" />
+ android:visibility="visible" />
+
+ <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="visible" />
+
+ <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="visible" />
<TextView
android:id="@+id/red_statu"
--
Gitblit v1.8.0