From d08a5a6d062f1568aaeb14d2d72357826291ef97 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期六, 13 七月 2024 18:14:28 +0800
Subject: [PATCH] 添加齐河管理卡相关逻辑 修复bug
---
qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml | 111 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 75 insertions(+), 36 deletions(-)
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
index 106296c..825e865 100644
--- a/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
@@ -48,10 +48,31 @@
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: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
@@ -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
@@ -109,12 +131,14 @@
android:textSize="@dimen/new_card_size" />
</LinearLayout>
+
<TextView
android:id="@+id/red_remainder_water"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鍓╀綑姘撮噺锛�"
+ android:visibility="gone"
android:textSize="@dimen/text_size" />
<TextView
@@ -125,7 +149,14 @@
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"
@@ -133,7 +164,7 @@
android:layout_marginTop="15dp"
android:text="鍏呭�兼鏁帮細"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
<TextView
android:id="@+id/red_total_water"
@@ -142,7 +173,7 @@
android:layout_marginTop="15dp"
android:text="鎬荤敤姘撮噺锛�"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
<TextView
android:id="@+id/red_total_power"
@@ -151,51 +182,59 @@
android:layout_marginTop="15dp"
android:text="鎬荤敤鐢甸噺锛�"
android:textSize="@dimen/text_size"
- android:visibility="visible" />
+ android:visibility="gone" />
- <LinearLayout
+ <TextView
+ android:id="@+id/red_waterPrice"
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/text_size" />
-
- <TextView
- android:id="@+id/red_statu"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="@dimen/new_card_size" />
-
- </LinearLayout>
+ 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>
@@ -204,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