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/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
index fe15c6c..ff99220 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
@@ -152,13 +152,13 @@
                             case 0://鏈笂鎶�
                                 binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.black, null));
                                 binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_no_bg, null));
-                                binding.dealButton.setBackgroundColor(getResources().getColor(R.color.title_color, null));
+                                binding.dealButton.setBackground(getResources().getDrawable(R.drawable.bottom_butten_blue_ripple, null));
                                 binding.dealButton.setVisibility(View.VISIBLE);
                                 break;
                             case 1://宸蹭笂鎶�
                                 binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
                                 binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_wait_bg, null));
-                                binding.dealButton.setBackgroundColor(getResources().getColor(R.color.delete_color, null));
+                                binding.dealButton.setBackground(getResources().getDrawable(R.drawable.bottom_butten_red_ripple, null));
                                 binding.dealButton.setVisibility(View.VISIBLE);
                                 binding.dealButton.setText("鍒犻櫎澶勭悊缁撴灉");
                                 break;
@@ -170,7 +170,7 @@
                             case 3://琚┏鍥�
                                 binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
                                 binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_reject_bg, null));
-                                binding.dealButton.setBackgroundColor(getResources().getColor(R.color.title_color));
+                                binding.dealButton.setBackground(getResources().getDrawable(R.drawable.bottom_butten_blue_ripple, null));
                                 binding.dealButton.setVisibility(View.VISIBLE);
                                 break;
 
@@ -223,8 +223,8 @@
                             binding.orderDealLL.setVisibility(View.VISIBLE);
                             binding.setDealData(t.getContent());
 
-                            if (!t.getContent().getImages().isEmpty()){
-                                for (ImageResult imageResult:t.getContent().getImages()){
+                            if (!t.getContent().getImages().isEmpty()) {
+                                for (ImageResult imageResult : t.getContent().getImages()) {
                                     ImageBean imageBean = new ImageBean();
                                     imageBean.setId(imageResult.getId());
                                     imageBean.setWebPath(imageResult.getWebPathZip());
@@ -233,15 +233,15 @@
                                     ImageInfo info = new ImageInfo();
                                     info.setOriginUrl(imageResult.getWebPath());
                                     info.setType(Type.IMAGE);
-                                    if (imageResult.getWebPathZip()!=null){
+                                    if (imageResult.getWebPathZip() != null) {
                                         info.setThumbnailUrl(imageResult.getWebPathZip());
                                     }
 
                                     imageInfoList.add(info);
                                 }
                             }
-                            if (!t.getContent().getVideos().isEmpty()){
-                                for (ImageResult imageResult:t.getContent().getVideos()){
+                            if (!t.getContent().getVideos().isEmpty()) {
+                                for (ImageResult imageResult : t.getContent().getVideos()) {
                                     ImageBean imageBean = new ImageBean();
                                     imageBean.setId(imageResult.getId());
                                     imageBean.setWebPath(imageResult.getWebPathZip());
@@ -250,7 +250,7 @@
                                     ImageInfo info = new ImageInfo();
                                     info.setOriginUrl(imageResult.getWebPath());
                                     info.setThumbnailUrl(imageResult.getWebPath());
-                                    if (imageResult.getWebPathZip()!=null){
+                                    if (imageResult.getWebPathZip() != null) {
                                         info.setThumbnailUrl(imageResult.getWebPathZip());
                                     }
                                     info.setType(Type.VIDEO);

--
Gitblit v1.8.0