From 040f1aba13b179ff318366680a6346af7fd97795 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 11 四月 2025 16:11:23 +0800
Subject: [PATCH] feat(generallibrary): 新增补卡功能并优化底部导航栏
---
generallibrary/src/main/res/layout/fragment_my.xml | 150 ++++++++++++++++++++++++++++---------------------
1 files changed, 86 insertions(+), 64 deletions(-)
diff --git a/generallibrary/src/main/res/layout/fragment_my.xml b/generallibrary/src/main/res/layout/fragment_my.xml
index 014772c..5140657 100644
--- a/generallibrary/src/main/res/layout/fragment_my.xml
+++ b/generallibrary/src/main/res/layout/fragment_my.xml
@@ -3,8 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="#F5F5F5">
+ android:background="#F5F5F5"
+ android:orientation="vertical">
<com.dayu.baselibrary.view.TitleBar
android:id="@+id/titleBar"
@@ -42,33 +42,73 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="12dp"
android:text="鍩烘湰淇℃伅"
android:textColor="#333333"
android:textSize="16sp"
- android:textStyle="bold"
- android:layout_marginBottom="12dp"/>
+ android:textStyle="bold" />
<LinearLayout
android:id="@+id/my_village"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp"
android:orientation="horizontal"
- android:visibility="gone"
- android:layout_marginBottom="8dp">
+ android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="璁惧缂栧彿锛�"
- android:textSize="@dimen/text_size"
- android:textColor="#666666" />
+ android:textColor="#666666"
+ android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/my_villageNum"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size"
- android:textColor="#333333" />
+ android:textColor="#333333"
+ android:textSize="@dimen/text_size" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐢ㄦ埛鍚嶇О锛�"
+ android:textColor="#666666"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/my_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="#333333"
+ android:textSize="@dimen/text_size" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎵嬫満鍙凤細"
+ android:textColor="#666666"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/my_phone"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="#333333"
+ android:textSize="@dimen/text_size" />
</LinearLayout>
<LinearLayout
@@ -96,7 +136,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:visibility="gone">
<TextView
android:layout_width="wrap_content"
@@ -117,7 +158,8 @@
android:id="@+id/my_waterPriceLL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:visibility="gone">
<TextView
android:layout_width="wrap_content"
@@ -153,18 +195,18 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="12dp"
android:text="璁板綍绠＄悊"
android:textColor="#333333"
android:textSize="16sp"
- android:textStyle="bold"
- android:layout_marginBottom="12dp"/>
+ android:textStyle="bold" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
- android:padding="8dp"
- android:background="#F9F9F9">
+ android:background="#F9F9F9"
+ android:padding="8dp">
<ImageView
android:id="@+id/card_icon"
@@ -180,8 +222,8 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
- android:layout_toEndOf="@+id/card_icon"
android:layout_toStartOf="@+id/my_newCardOut"
+ android:layout_toEndOf="@+id/card_icon"
android:text="寮�鍗¤褰�"
android:textColor="#333333"
android:textSize="@dimen/text_size" />
@@ -194,8 +236,8 @@
android:layout_centerVertical="true"
android:background="@drawable/rounded_button_bg"
android:paddingStart="12dp"
- android:paddingEnd="12dp"
android:paddingTop="4dp"
+ android:paddingEnd="12dp"
android:paddingBottom="4dp"
android:text="瀵煎嚭璁板綍"
android:textColor="@color/white"
@@ -205,8 +247,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:background="#F9F9F9">
+ android:background="#F9F9F9"
+ android:padding="8dp">
<ImageView
android:id="@+id/recharge_icon"
@@ -222,8 +264,8 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
- android:layout_toEndOf="@+id/recharge_icon"
android:layout_toStartOf="@+id/my_rechargeOut"
+ android:layout_toEndOf="@+id/recharge_icon"
android:text="鍏呭�艰褰�"
android:textColor="#333333"
android:textSize="@dimen/text_size" />
@@ -236,8 +278,8 @@
android:layout_centerVertical="true"
android:background="@drawable/rounded_button_bg"
android:paddingStart="12dp"
- android:paddingEnd="12dp"
android:paddingTop="4dp"
+ android:paddingEnd="12dp"
android:paddingBottom="4dp"
android:text="瀵煎嚭璁板綍"
android:textColor="@color/white"
@@ -262,41 +304,33 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="12dp"
android:text="绯荤粺璁剧疆"
android:textColor="#333333"
android:textSize="16sp"
- android:textStyle="bold"
- android:layout_marginBottom="12dp"/>
+ android:textStyle="bold" />
- <TextView
- android:id="@+id/sys_ip"
+ <RelativeLayout
+ android:id="@+id/logoutRL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="12dp"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:drawableStart="@android:drawable/ic_menu_manage"
- android:drawablePadding="8dp"
- android:drawableTint="#666666"
- android:text="IP璁剧疆"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="gone" />
+ android:orientation="vertical"
+ android:layout_marginBottom="8dp">
- <TextView
- android:id="@+id/card_replacement"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="12dp"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:drawableStart="@android:drawable/ic_menu_edit"
- android:drawablePadding="8dp"
- android:drawableTint="#666666"
- android:text="鐢ㄦ埛琛ュ崱"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="gone" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="閫�鍑虹櫥褰�"
+ android:textColor="#000000"
+ android:textSize="@dimen/text_size" />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:src="@drawable/ic_arrow_right"/>
+ </RelativeLayout>
+
<TextView
android:id="@+id/my_psw"
@@ -304,28 +338,16 @@
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="#F9F9F9"
- android:padding="12dp"
android:drawableStart="@android:drawable/ic_lock_lock"
android:drawablePadding="8dp"
android:drawableTint="#666666"
+ android:padding="12dp"
android:text="鐧诲綍瀵嗙爜璁剧疆"
android:textColor="#333333"
android:textSize="@dimen/text_size"
android:visibility="gone" />
- <TextView
- android:id="@+id/my_testConnect"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#F9F9F9"
- android:padding="12dp"
- android:drawableStart="@android:drawable/ic_menu_compass"
- android:drawablePadding="8dp"
- android:drawableTint="#666666"
- android:text="鏈繛鎺ユ暟鎹腑蹇�"
- android:textColor="#333333"
- android:textSize="@dimen/text_size"
- android:visibility="gone" />
+
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
--
Gitblit v1.8.0