From 8521954fa97bdfc54123afb4a72755ece311db06 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 21 三月 2025 14:45:45 +0800
Subject: [PATCH] feat(general): 更新登录逻辑和用户信息展示

---
 qihealonelibrary/src/main/res/layout/activity_my_qha.xml |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
index f6baa22..f933594 100644
--- a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
@@ -58,18 +58,40 @@
                     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>
 
+            <LinearLayout
+                android:id="@+id/my_waterPriceLL"
+                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:textColor="@color/text_selecter_color"
+                    android:textSize="@dimen/text_size" />
+
+                <TextView
+                    android:id="@+id/my_waterPrice"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/text_selecter_color"
+                    android:textSize="@dimen/text_size" />
+
+            </LinearLayout>
 
             <RelativeLayout
 
@@ -84,7 +106,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
@@ -93,7 +115,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>
 
@@ -109,7 +131,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
@@ -118,7 +140,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>
@@ -130,7 +152,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
                 android:text="IP璁剧疆"
-                android:textColor="@color/text_selecter"
+                android:textColor="@color/text_selecter_color"
                 android:textSize="@dimen/text_size"
                 android:visibility="gone" />
 
@@ -140,7 +162,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"
                 android:visibility="gone" />
 
@@ -151,7 +173,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
@@ -160,7 +182,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"
                 android:visibility="gone" />
         </LinearLayout>

--
Gitblit v1.8.0