From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
app/src/main/res/layout/fragment_my.xml | 84 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml
index 731f974..828294f 100644
--- a/app/src/main/res/layout/fragment_my.xml
+++ b/app/src/main/res/layout/fragment_my.xml
@@ -7,16 +7,15 @@
android:background="@color/bg_color">
-
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
+ android:layout_height="@dimen/title_height"
android:background="@color/title_color"
- android:textSize="@dimen/title_center_text_size"
android:gravity="center"
android:text="鎴戠殑"
android:textColor="@color/white"
- android:layout_height="@dimen/title_height"/>
+ android:textSize="@dimen/title_center_text_size" />
<View
@@ -71,7 +70,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
- android:text="18311594524"
+ android:text=""
android:textColor="@color/grey" />
</LinearLayout>
@@ -80,19 +79,45 @@
<RelativeLayout
- android:id="@+id/headRL"
+ android:id="@+id/issueListRL"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
+ android:background="@drawable/my_item_ripple"
android:layout_below="@+id/headRL_top">
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
- android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="30dp"
- android:text="澶村儚"
+ android:text="闂鍒楄〃"
+ android:textColor="@color/black"
+ android:textSize="@dimen/my_item_text_size" />
+
+ <ImageView
+ android:layout_width="25dp"
+ android:layout_height="25dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="15dp"
+ android:src="@drawable/ic_right" />
+ </RelativeLayout>
+ <RelativeLayout
+ android:id="@+id/inspectListRL"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_height"
+ android:layout_marginTop="1dp"
+ android:background="@drawable/my_item_ripple"
+ android:layout_below="@+id/issueListRL">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_height"
+ android:gravity="center_vertical"
+ android:paddingLeft="30dp"
+ android:text="宸℃璁板綍"
+ android:layout_marginTop="1dp"
android:textColor="@color/black"
android:textSize="@dimen/my_item_text_size" />
@@ -105,20 +130,18 @@
android:src="@drawable/ic_right" />
</RelativeLayout>
-
<RelativeLayout
- android:id="@+id/passwordRL"
+ android:id="@+id/changePSRL"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
- android:layout_below="@+id/headRL"
+ android:background="@drawable/my_item_ripple"
+ android:layout_below="@+id/inspectListRL"
android:layout_marginTop="1dp">
<TextView
android:id="@+id/changePS"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
-
- android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="30dp"
android:text="淇敼瀵嗙爜"
@@ -133,19 +156,44 @@
android:layout_marginRight="15dp"
android:src="@drawable/ic_right" />
</RelativeLayout>
+ <RelativeLayout
+ android:id="@+id/refreshDataRL"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_height"
+ android:background="@drawable/my_item_ripple"
+ android:layout_below="@+id/changePSRL"
+ android:layout_marginTop="1dp">
+ <TextView
+ android:id="@+id/refreshDataTV"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_height"
+ android:gravity="center_vertical"
+ android:paddingLeft="30dp"
+ android:text="鏇存柊鏈湴鏁版嵁"
+ android:textColor="@color/black"
+ android:textSize="@dimen/my_item_text_size" />
+
+ <ImageView
+ android:layout_width="25dp"
+ android:layout_height="25dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="15dp"
+ android:src="@drawable/ic_right" />
+ </RelativeLayout>
<RelativeLayout
android:id="@+id/cleanDataRL"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
- android:layout_below="@+id/passwordRL"
+ android:background="@drawable/my_item_ripple"
+ android:layout_below="@+id/refreshDataRL"
android:layout_marginTop="1dp">
<TextView
android:id="@+id/cleanData"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
- android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="30dp"
android:text="娓呴櫎缂撳瓨"
@@ -160,10 +208,12 @@
android:layout_marginRight="15dp"
android:src="@drawable/ic_right" />
</RelativeLayout>
+
<RelativeLayout
android:id="@+id/loginOutRL"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
+ android:background="@drawable/my_item_ripple"
android:layout_below="@+id/cleanDataRL"
android:layout_marginTop="1dp">
@@ -171,7 +221,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
- android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="30dp"
android:text="閫�鍑虹櫥褰�"
@@ -187,23 +236,23 @@
android:layout_marginRight="15dp"
android:src="@drawable/ic_right" />
</RelativeLayout>
+
<RelativeLayout
android:id="@+id/versionRL"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
+ android:background="@drawable/my_item_ripple"
android:layout_below="@+id/loginOutRL"
android:layout_marginTop="1dp">
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
- android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="30dp"
android:text="褰撳墠鐗堟湰"
android:textColor="@color/black"
android:textSize="@dimen/my_item_text_size" />
-
<TextView
@@ -217,7 +266,6 @@
android:textColor="@color/text_color"
android:textSize="15sp" />
</RelativeLayout>
-
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0