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/activity_order_deal.xml | 127 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 110 insertions(+), 17 deletions(-)
diff --git a/app/src/main/res/layout/activity_order_deal.xml b/app/src/main/res/layout/activity_order_deal.xml
index 1465137..a254f14 100644
--- a/app/src/main/res/layout/activity_order_deal.xml
+++ b/app/src/main/res/layout/activity_order_deal.xml
@@ -10,7 +10,7 @@
<variable
name="data"
- type="com.dayu.pipirrapp.bean.net.OrderListResult.Data" />
+ type="com.dayu.pipirrapp.bean.net.OrderDetailResult" />
</data>
<RelativeLayout
@@ -31,38 +31,131 @@
android:layout_above="@+id/deal_button"
android:layout_below="@+id/title"
android:orientation="vertical"
- android:padding="20dp">
+ >
- <TextView
- android:layout_width="wrap_content"
+
+ <RelativeLayout
+ android:id="@+id/timeLL"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:gravity="center"
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/my_item_ripple"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/leftiocn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="* "
+ android:gravity="center"
+
+ android:layout_centerVertical="true"
+ android:textColor="@color/base_red"
+ android:textSize="@dimen/order_detail_button_size" />
+
+ <TextView
+ android:id="@+id/timeTV"
+ android:layout_width="wrap_content"
+
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toEndOf="@+id/leftiocn"
+ android:text="鍙嶉鏃堕棿锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/order_detail_button_size" />
+ <TextView
+ android:id="@+id/timeData"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toEndOf="@+id/timeTV"
+ android:layout_marginLeft="10dp"
+ android:textColor="@color/black"
+ android:textSize="@dimen/order_detail_button_size" />
+ <ImageView
+ android:layout_width="25dp"
+ android:layout_height="25dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+
+ android:src="@drawable/ic_right" />
+ </RelativeLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鍙嶉鍐呭锛�"
- android:textColor="@color/black"
- android:textSize="@dimen/order_detail_button_size" />
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="* "
+ android:textColor="@color/base_red"
+ android:textSize="@dimen/order_detail_button_size" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍙嶉鍐呭锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/order_detail_button_size" />
+ </LinearLayout>
<EditText
+ android:id="@+id/contentET"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/edittext_backgroud"
- android:minHeight="100dp" />
+ android:gravity="start"
+ android:maxHeight="200dp"
+ android:minHeight="100dp"
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
+ android:text="" />
- <TextView
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="鎻愪氦鍥剧墖锛�"
android:layout_marginTop="10dp"
- android:textColor="@color/black"
- android:textSize="@dimen/order_detail_button_size" />
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="* "
+ android:textColor="@color/base_red"
+ android:textSize="@dimen/order_detail_button_size" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+
+ android:text="鎻愪氦鍥剧墖鎴栬棰戯細"
+ android:textColor="@color/black"
+ android:textSize="@dimen/order_detail_button_size" />
+ </LinearLayout>
+
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="5dp"
- android:background="@color/white"
+ android:layout_marginRight="20dp"
+ android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
- android:overScrollMode="never" />
+ android:background="@color/white"
+ android:overScrollMode="never"
+ android:padding="5dp" />
</LinearLayout>
@@ -70,8 +163,8 @@
android:id="@+id/deal_button"
android:layout_width="match_parent"
android:layout_height="@dimen/order_detail_button_height"
+ android:background="@drawable/bottom_butten_blue_ripple"
android:layout_alignParentBottom="true"
- android:background="@color/title_color"
android:gravity="center"
android:text="鎻� 浜�"
android:textColor="@color/white"
--
Gitblit v1.8.0